aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorPhilip Balister <philip@balister.org>2006-10-28 13:48:12 +0000
committerPhilip Balister <philip@balister.org>2006-10-28 13:48:12 +0000
commita84ca6515375010be1cb18ec82ec48968b89bb84 (patch)
tree1b430a4a6516a660fb9a4c5c6372fb101acd22bf /conf
parent0332c860f096406ed143260218d9938b79173599 (diff)
parent4c49cec0f00a58693f324b06363744dbcf856329 (diff)
downloadopenembedded-a84ca6515375010be1cb18ec82ec48968b89bb84.tar.gz
merge of '9bb5aacf211c840ef28190458936fec0e3163a18'
and 'a89f7dd0fbeeb4f5627838591cb356337a0b5ae2'
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/compulab-pxa270.conf22
-rw-r--r--conf/machine/ep93xx.conf11
-rw-r--r--conf/machine/jornada56x.conf2
3 files changed, 24 insertions, 11 deletions
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
new file mode 100644
index 0000000000..38bc900050
--- /dev/null
+++ b/conf/machine/compulab-pxa270.conf
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@Name: Compulab PXA270 system
+#@DESCRIPTION: Machine configuration for LogicPD PXA270 system
+#OLDEST_KERNEL = "2.6.17"
+TARGET_ARCH = "arm"
+PREFERRED_VERSION_logicpd-pxa270 = "2.6.17"
+GUI_MACHINE_CLASS = "bigscreen"
+
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
+
+include conf/machine/include/tune-xscale.conf
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttySA0"
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE = "32"
+
+EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000"
+
+
diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index 955344344a..82905dd089 100644
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -11,16 +11,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
#don't try to access tty1
USE_VT = "0"
-
-
-#ship in rootfs:
-EP93XX_MODULES = "kernel-module-apm \
- kernel-module-pcmcia-core \
- kernel-module-ipv6 "
-
-BOOTSTRAP_EXTRA_RRECOMMENDS += "${EP93XX_MODULES}"
-BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
-
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost"
# used by sysvinit_2
SERIAL_CONSOLE = "57600 ttyAM0"
diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf
index a4a6af1f71..d6b3c70454 100644
--- a/conf/machine/jornada56x.conf
+++ b/conf/machine/jornada56x.conf
@@ -4,7 +4,7 @@
TARGET_ARCH = "arm"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules module-init-tools"