diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-07-28 01:37:45 +0100 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-07-30 16:40:39 +0100 |
commit | 0d741511a6be60faec917583c1c50863e31c3e0d (patch) | |
tree | 2069e59228549753b3e255e12cddc26e0c698b94 /conf/machine | |
parent | 40e86b9249cc171f0e4369d9723d7177a8a3d7e4 (diff) | |
download | meta-handheld-0d741511a6be60faec917583c1c50863e31c3e0d.tar.gz |
Update for tune file cleanup in oe-core
* Remove tune-xscale.inc, tune-arm*.inc
* Switch machines using tune-strongarm.inc to tune-strongarm1100.inc
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'conf/machine')
-rw-r--r-- | conf/machine/collie.conf | 2 | ||||
-rw-r--r-- | conf/machine/h3600.conf | 2 | ||||
-rw-r--r-- | conf/machine/include/tune-arm920t.inc | 4 | ||||
-rw-r--r-- | conf/machine/include/tune-arm926ejs.inc | 7 | ||||
-rw-r--r-- | conf/machine/include/tune-strongarm.inc | 11 | ||||
-rw-r--r-- | conf/machine/include/tune-xscale.inc | 9 | ||||
-rw-r--r-- | conf/machine/include/zaurus.inc | 2 | ||||
-rw-r--r-- | conf/machine/jornada56x.conf | 2 | ||||
-rw-r--r-- | conf/machine/jornada7xx.conf | 2 | ||||
-rw-r--r-- | conf/machine/simpad.conf | 2 |
10 files changed, 5 insertions, 38 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index a0d710c..51001c7 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices require conf/machine/include/zaurus.inc -require conf/machine/include/tune-strongarm.inc +require conf/machine/include/tune-strongarm1100.inc ROOT_FLASH_SIZE = "14" # actually 14680064 diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index 7bbb223..8b1a417 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -7,7 +7,7 @@ # TARGET_ARCH = "arm" -require conf/machine/include/tune-strongarm.inc +require conf/machine/include/tune-strongarm1100.inc # h3700, h3800 have 32, but let that be the bonus ROOT_FLASH_SIZE = "16" diff --git a/conf/machine/include/tune-arm920t.inc b/conf/machine/include/tune-arm920t.inc deleted file mode 100644 index fee5c58..0000000 --- a/conf/machine/include/tune-arm920t.inc +++ /dev/null @@ -1,4 +0,0 @@ -FEED_ARCH = "armv4t" -BASE_PACKAGE_ARCH = "armv4t" -TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" -PACKAGE_EXTRA_ARCHS += "armv4 armv4t" diff --git a/conf/machine/include/tune-arm926ejs.inc b/conf/machine/include/tune-arm926ejs.inc deleted file mode 100644 index f41e460..0000000 --- a/conf/machine/include/tune-arm926ejs.inc +++ /dev/null @@ -1,7 +0,0 @@ -FEED_ARCH = "armv5te" -PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te" -# For gcc 3.x you need: -#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" -# For gcc 4.x you need: -TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" -BASE_PACKAGE_ARCH = "armv5te" diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc deleted file mode 100644 index ac584e3..0000000 --- a/conf/machine/include/tune-strongarm.inc +++ /dev/null @@ -1,11 +0,0 @@ -# This machine lists common configuration options for Strongarm devices -# gcc does not differentiate between the different Strongarm versions, so neither do we -# http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-January/004031.html - -TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm" -FEED_ARCH = "armv4" -BASE_PACKAGE_ARCH = "armv4" -PACKAGE_EXTRA_ARCHS += "armv4" - -ARM_INSTRUCTION_SET = "arm" -THUMB_INTERWORK = "no" diff --git a/conf/machine/include/tune-xscale.inc b/conf/machine/include/tune-xscale.inc deleted file mode 100644 index f0f58bc..0000000 --- a/conf/machine/include/tune-xscale.inc +++ /dev/null @@ -1,9 +0,0 @@ -# this depends on fact that for ARM the TARGET_ARCH is 'arm' for little endian and 'armeb' for bigendian -# this is the case as of now for all arm machines in OE. - -FEED_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('TARGET_ARCH', d, 1) == 'arm']}" - -TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" -TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" -PACKAGE_EXTRA_ARCHS += "${@['armv4b armv4tb armv5teb', 'armv4 armv4t armv5te'][ bb.data.getVar('TARGET_ARCH', d, 1) == 'arm']}" -BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('TARGET_ARCH', d, 1) == 'arm']}" diff --git a/conf/machine/include/zaurus.inc b/conf/machine/include/zaurus.inc index 0bbed6e..713995c 100644 --- a/conf/machine/include/zaurus.inc +++ b/conf/machine/include/zaurus.inc @@ -76,8 +76,6 @@ LOGO_SIZE = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "vga", "qvga" # machine tuning ################ -TARGET_ARCH = "arm" - SERIAL_CONSOLE = "115200 ttyS0" SERIAL_CONSOLE_collie = "115200 ttySA0" diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index 72fff1e..a42dd8c 100644 --- a/conf/machine/jornada56x.conf +++ b/conf/machine/jornada56x.conf @@ -12,4 +12,4 @@ EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p" SERIAL_CONSOLE = "115200 ttySA0" -require conf/machine/include/tune-strongarm.inc +require conf/machine/include/tune-strongarm1100.inc diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf index d444cb9..eea4b2b 100644 --- a/conf/machine/jornada7xx.conf +++ b/conf/machine/jornada7xx.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" -require conf/machine/include/tune-strongarm.inc +require conf/machine/include/tune-strongarm1100.inc PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx" PCMCIA_MANAGER = "pcmciautils" diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index c1fc402..6073d33 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -9,7 +9,7 @@ MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat kernel26" PREFERRED_PROVIDER_virtual/kernel = "linux" PCMCIA_MANAGER ?= "pcmciautils" -require conf/machine/include/tune-strongarm.inc +require conf/machine/include/tune-strongarm1100.inc ROOT_FLASH_SIZE = "16" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000" |