summaryrefslogtreecommitdiffstats
path: root/conf/machine/collie.conf
diff options
context:
space:
mode:
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>2008-01-12 14:13:20 +0000
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>2008-01-12 14:13:20 +0000
commit61fc2558227783fe8553783cf3cfbb3a2732577e (patch)
tree92725425e906b8bcd53db8aca5bf9ceb7f5579bc /conf/machine/collie.conf
parent3b85f1584efddfb1c51ddb046667d1dfe37f042c (diff)
downloadopenembedded-61fc2558227783fe8553783cf3cfbb3a2732577e.tar.gz
conf/machine/: fix configuration for Strongarm devices
* replace erroneous TARGET_CC_ARCH line optimising for xscale instead of strongarm * remove inclusion of tune-strongarm.inc from collie.conf and replace it with the correct TARGET_CC_ARCH. Collie is the only Strongarm 1110 device in OE and thus needs special treatment * rename tune-strongarm.inc to tune-strongarm1100.inc and leave a short note to make it clear the file only applies to Strongarm 1100 devices.
Diffstat (limited to 'conf/machine/collie.conf')
-rw-r--r--conf/machine/collie.conf5
1 files changed, 1 insertions, 4 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index c91bdcfc92..b9e6f6e6aa 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -3,6 +3,7 @@
#@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
TARGET_ARCH = "arm"
+TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1110"
MACHINE_KERNEL_VERSION ?= "2.6"
require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc
@@ -13,13 +14,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-
IMAGE_LINGUAS = ""
-
IMAGE_FSTYPES ?= "jffs2 tar.gz"
-require conf/machine/include/tune-strongarm.inc
-
ROOT_FLASH_SIZE = "14"
# actually 14680064, see EXTRA_IMAGECMD above