From c5eb38dbacd45160840308061f811165a87b7df4 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 28 Jan 2008 13:48:13 +0000 Subject: conf/machine: Go back to treating all Strongarm devices the same. * http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-January/004031.html gcc does not differentiate between the different Strongarm flavors, why should OE? --- conf/machine/collie.conf | 2 +- conf/machine/h3600.conf | 2 +- conf/machine/htcwallaby.conf | 2 +- conf/machine/include/tune-strongarm.inc | 6 ++++++ conf/machine/include/tune-strongarm1100.inc | 5 ----- conf/machine/jornada56x.conf | 2 +- conf/machine/jornada7xx.conf | 2 +- conf/machine/shark.conf | 2 +- conf/machine/simpad.conf | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 conf/machine/include/tune-strongarm.inc delete mode 100644 conf/machine/include/tune-strongarm1100.inc (limited to 'conf/machine') diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 04e0e83051..5170f8993e 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -3,10 +3,10 @@ #@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/zaurus-${MACHINE_KERNEL_VERSION}.inc +require conf/machine/include/tune-strongarm.inc PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index 6f0e37b803..c037226154 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 " -require conf/machine/include/tune-strongarm1100.inc +require conf/machine/include/tune-strongarm.inc # h3700, h3800 have 32, but let that be the bonus ROOT_FLASH_SIZE = "16" diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf index 515700d9e6..34255a1536 100644 --- a/conf/machine/htcwallaby.conf +++ b/conf/machine/htcwallaby.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 " -require conf/machine/include/tune-strongarm1100.inc +require conf/machine/include/tune-strongarm.inc ROOT_FLASH_SIZE = "16" VOLATILE_STORAGE_SIZE = "32" diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc new file mode 100644 index 0000000000..448b28c91f --- /dev/null +++ b/conf/machine/include/tune-strongarm.inc @@ -0,0 +1,6 @@ +# 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" + diff --git a/conf/machine/include/tune-strongarm1100.inc b/conf/machine/include/tune-strongarm1100.inc deleted file mode 100644 index f136710409..0000000000 --- a/conf/machine/include/tune-strongarm1100.inc +++ /dev/null @@ -1,5 +0,0 @@ -# This machine lists common configuration options for Strongarm 1100 devices -# NOTE: The Zaurus Collie also has a Strongarm processor, but uses the 1110 type - -TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1100" - diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index a42dd8c127..72fff1ed5e 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-strongarm1100.inc +require conf/machine/include/tune-strongarm.inc diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf index ee9117e406..8741eb4ff6 100644 --- a/conf/machine/jornada7xx.conf +++ b/conf/machine/jornada7xx.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" -require conf/machine/include/tune-strongarm1100.inc +require conf/machine/include/tune-strongarm.inc PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx" PCMCIA_MANAGER = "pcmciautils" diff --git a/conf/machine/shark.conf b/conf/machine/shark.conf index 87c260856d..d7d35cfda1 100644 --- a/conf/machine/shark.conf +++ b/conf/machine/shark.conf @@ -15,7 +15,7 @@ SERIAL_CONSOLE = "ttySA0 115200 vt100" ROOT_FLASH_SIZE = "16" USE_VT = "0" -require conf/machine/include/tune-strongarm1100.inc +require conf/machine/include/tune-strongarm.inc MACHINE_FEATURES = "kernel26 apm alsa pcmcia keyboard ext2" MACHINE_EXTRA_RDEPENDS_append = " mpg321 mpd madplay " diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index e187ee1e75..6334d34171 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -9,7 +9,7 @@ TARGET_ARCH = "arm" MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat" include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc -require conf/machine/include/tune-strongarm1100.inc +require conf/machine/include/tune-strongarm.inc ROOT_FLASH_SIZE = "16" -- cgit 1.2.3-korg