aboutsummaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-02-25 21:57:43 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-02-25 21:57:43 +0000
commit5ff34a0ef7bfe87352d78c20b9f37b17ba9faf21 (patch)
tree98d5ca9ce4405f0205047236eba6b82159aba959 /conf/machine
parent68322f544d84f54b2ce186a3f773f7f163e45170 (diff)
downloadopenembedded-5ff34a0ef7bfe87352d78c20b9f37b17ba9faf21.tar.gz
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/25 15:57:42-06:00 ti.com!kergoth Add armv6te to the list of ipkg architectures for the OMAP 2420 H4 machine. 2005/02/25 15:54:44-06:00 ti.com!kergoth Add MACHINE files for OMAP 1510 Innovator, OMAP 2420 H4, and OMAP 1710 H3. 2005/02/25 15:51:42-06:00 ti.com!kergoth Add SERIAL_CONSOLE to the OMAP MACHINEs, and include udev in bootstrap for openomap. 2005/02/25 15:31:56-06:00 ti.com!kergoth Fix the recent ipkg-native paths fix. One of my changes to ipkg.h was inadvertantly lost. BKrev: 421f9f57rdJ__oAnBg3NwcJGwF2Fqw
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/omap1510inn.conf0
-rw-r--r--conf/machine/omap1610h2.conf4
-rw-r--r--conf/machine/omap1710h3.conf0
-rw-r--r--conf/machine/omap2420h4.conf0
-rw-r--r--conf/machine/omap5912osk.conf18
5 files changed, 21 insertions, 1 deletions
diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/omap1510inn.conf
diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf
index 769c08cc70..40aaa2917a 100644
--- a/conf/machine/omap1610h2.conf
+++ b/conf/machine/omap1610h2.conf
@@ -4,13 +4,15 @@
TARGET_ARCH = "arm"
IPKG_ARCHS = "all arm armv5te ${MACHINE}"
+
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-MODUTILS = "26"
+
BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral"
BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
+SERIAL_CONSOLE ?= "115200 ttyS0"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
include conf/machine/tune-arm926ejs.conf
diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/omap1710h3.conf
diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/omap2420h4.conf
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index e69de29bb2..a01e970665 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: OMAP5912 cpu on an OSK board
+#@DESCRIPTION: Machine configuration for the OMAP Starter Kit with a 5912 processor
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm armv5te ${MACHINE}"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+
+BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral"
+BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
+
+include conf/machine/tune-arm926ejs.conf