summaryrefslogtreecommitdiff
path: root/openembedded/conf/machine
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-10-10 10:41:35 +0000
committerRichard Purdie <richard@openedhand.com>2005-10-10 10:41:35 +0000
commitcbf3ef91305558fb8a59e19c5987a9e9ca22013a (patch)
treef7142e57734a8b2fac92ff758a6617d4464a82f9 /openembedded/conf/machine
parent562d4d35878bb644cbe2b9f23ef407fd6e1e38e2 (diff)
downloadopenembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.gz
openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.bz2
openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.xz
openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.zip
Merge changes from mainline OE to try and keep us in sync.
git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf/machine')
-rw-r--r--openembedded/conf/machine/ipaq-pxa270.conf2
-rw-r--r--openembedded/conf/machine/nokia770.conf1
2 files changed, 3 insertions, 0 deletions
diff --git a/openembedded/conf/machine/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf
index ec2b1beb0..b9925852e 100644
--- a/openembedded/conf/machine/ipaq-pxa270.conf
+++ b/openembedded/conf/machine/ipaq-pxa270.conf
@@ -12,6 +12,8 @@ PREFERRED_VERSION_orinoco-modules = "0.15rc1"
BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params"
BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev module-init-tools"
+ROOT_FLASH_SIZE = "80"
+
BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}"
BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
diff --git a/openembedded/conf/machine/nokia770.conf b/openembedded/conf/machine/nokia770.conf
index 8690348fa..9f49f2456 100644
--- a/openembedded/conf/machine/nokia770.conf
+++ b/openembedded/conf/machine/nokia770.conf
@@ -57,3 +57,4 @@ pcmcia-cs apm ppp wireless-tools console-tools"
ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
include conf/machine/handheld-common.conf
+