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.

9 files changed, 12 insertions, 12 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
 
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index c037226154..6f0e37b803 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-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/htcwallaby.conf b/conf/machine/htcwallaby.conf
index 34255a1536..515700d9e6 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-strongarm.inc
+require conf/machine/include/tune-strongarm1100.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
deleted file mode 100644
index 8654c996ef..0000000000
--- a/conf/machine/include/tune-strongarm.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-march=armv4 -mtune=xscale"
-
diff --git a/conf/machine/include/tune-strongarm1100.inc b/conf/machine/include/tune-strongarm1100.inc
new file mode 100644
index 0000000000..f136710409
--- /dev/null
+++ b/conf/machine/include/tune-strongarm1100.inc
@@ -0,0 +1,5 @@
+# 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 72fff1ed5e..a42dd8c127 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 8741eb4ff6..ee9117e406 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/shark.conf b/conf/machine/shark.conf
index d7d35cfda1..87c260856d 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-strongarm.inc
+require conf/machine/include/tune-strongarm1100.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 6334d34171..e187ee1e75 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-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 
 ROOT_FLASH_SIZE = "16"