summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2006-07-04 11:23:17 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-07-04 11:23:17 +0000
commitc5e967b3c4b8fca10803c391d0e15c71cfc9aa4b (patch)
tree8fa32665630afece64fdb587e0a90ba0fa5e7912
parent0664707090a729d50f4a9358325f23a22bd9e471 (diff)
parentd649adfcaf691303147f0ac30a41ec1f0ba8394b (diff)
merge of 2e5f74aaab40ef75a6f2fc3a1957ec9e64efe919
and dd117e97833aeb9cbc87f3bda3749aae2426d332
-rw-r--r--conf/machine/logicpd-pxa270.conf5
-rw-r--r--conf/machine/mainstone.conf5
2 files changed, 5 insertions, 5 deletions
diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf
index 24e23bc9a0..206958c2ce 100644
--- a/conf/machine/logicpd-pxa270.conf
+++ b/conf/machine/logicpd-pxa270.conf
@@ -7,8 +7,9 @@ PREFERRED_VERSION_logicpd-pxa270 = "2.6.17-rc5"
GUI_MACHINE_CLASS = "smallscreen"
PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
-include conf/machine/include/tune-iwmmxt.conf
+include conf/machine/include/tune-xscale.conf
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttyS0"
@@ -16,4 +17,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
# used by opie-collections.inc
ROOT_FLASH_SIZE = "32"
# EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000"
+EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000"
+
diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf
index de242242a7..357e286752 100644
--- a/conf/machine/mainstone.conf
+++ b/conf/machine/mainstone.conf
@@ -9,7 +9,7 @@ IPKG_EXTRA_ARCHS = "armv5te"
PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
-include conf/machine/include/tune-iwmmxt.conf
+include conf/machine/include/tune-xscale.conf
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttyS0"
@@ -18,6 +18,3 @@ SERIAL_CONSOLE = "115200 ttyS0"
ROOT_FLASH_SIZE = "32"
-
-
-