[oe-commits] org.oe.dev conf/machine: Go back to treating all Strongarm devices the same.

[Laibsch commit]

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?

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: e5a4ea76d9c872b195ecd4a8b3cf6e2c49849d72
ViewMTN: http://monotone.openembedded.org/revision/info/e5a4ea76d9c872b195ecd4a8b3cf6e2c49849d72
Files:
1
conf/machine/include/tune-strongarm1100.inc
conf/machine/include/tune-strongarm.inc
conf/machine/collie.conf
conf/machine/h3600.conf
conf/machine/htcwallaby.conf
conf/machine/jornada56x.conf
conf/machine/jornada7xx.conf
conf/machine/shark.conf
conf/machine/simpad.conf
Diffs:

#
# mt diff -r847b7160fc25cee37306cd2b0e2296e08c2968b1 -re5a4ea76d9c872b195ecd4a8b3cf6e2c49849d72
#
# 
# 
# rename "conf/machine/include/tune-strongarm1100.inc"
#     to "conf/machine/include/tune-strongarm.inc"
# 
# patch "conf/machine/collie.conf"
#  from [7c673b43c50f37bbb2d12b14434564b0e9613ec3]
#    to [c23a85835bc13ac978f36742cfc8ccf5880e0ec8]
# 
# patch "conf/machine/h3600.conf"
#  from [946b47e617dd5bb30df3ee547902b05861e89f5b]
#    to [baccbbb3fd46dea023ff7dc49ac173b169688428]
# 
# patch "conf/machine/htcwallaby.conf"
#  from [d6588b12e47e4671574a6a9f611ca56ed3e54a66]
#    to [f536aa7626c709ec12492ce50cec7af6c4062a8c]
# 
# patch "conf/machine/include/tune-strongarm.inc"
#  from [6b646008e17bfa06b0b28e48fd811701e7f4ea78]
#    to [05471dc0b54ab7a2645738ef50732cc747c8c18b]
# 
# patch "conf/machine/jornada56x.conf"
#  from [6e67e41a8cb53163822499066dcf76e2ed17c3eb]
#    to [feef2730324948026b5302d47b01bae79fa6bc39]
# 
# patch "conf/machine/jornada7xx.conf"
#  from [b8d6ade022066bbe05995a96ff6dc4c32bb0c5ac]
#    to [931f12408f78e84eaafc92103fd2590493bcd246]
# 
# patch "conf/machine/shark.conf"
#  from [45f471879704cfba13dd30daae06942e7bdd6716]
#    to [8a744b9daf9db02c05297d317225e9f6d6cb012e]
# 
# patch "conf/machine/simpad.conf"
#  from [b9316853a8b1c9a28a1c4df96b4166a416335cc3]
#    to [9987d298771d159fd85308e85bdb5a82fd16832d]
# 
============================================================
--- conf/machine/collie.conf	7c673b43c50f37bbb2d12b14434564b0e9613ec3
+++ conf/machine/collie.conf	c23a85835bc13ac978f36742cfc8ccf5880e0ec8
@@ -1,12 +1,12 @@ TARGET_ARCH = "arm"
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-5000, Sharp Zaurus SL-5500
 #@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"
 
============================================================
--- conf/machine/h3600.conf	946b47e617dd5bb30df3ee547902b05861e89f5b
+++ conf/machine/h3600.conf	baccbbb3fd46dea023ff7dc49ac173b169688428
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "armv4 "
 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"
============================================================
--- conf/machine/htcwallaby.conf	d6588b12e47e4671574a6a9f611ca56ed3e54a66
+++ conf/machine/htcwallaby.conf	f536aa7626c709ec12492ce50cec7af6c4062a8c
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "armv4 "
 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"
============================================================
--- conf/machine/include/tune-strongarm1100.inc	6b646008e17bfa06b0b28e48fd811701e7f4ea78
+++ conf/machine/include/tune-strongarm.inc	05471dc0b54ab7a2645738ef50732cc747c8c18b
@@ -1,5 +1,6 @@
-# This machine lists common configuration options for Strongarm 1100 devices
-# NOTE: The Zaurus Collie also has a Strongarm processor, but uses the 1110 type
+# 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=strongarm1100"
+TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm"
 
============================================================
--- conf/machine/jornada56x.conf	6e67e41a8cb53163822499066dcf76e2ed17c3eb
+++ conf/machine/jornada56x.conf	feef2730324948026b5302d47b01bae79fa6bc39
@@ -12,4 +12,4 @@ SERIAL_CONSOLE = "115200 ttySA0"
 
 SERIAL_CONSOLE = "115200 ttySA0"
 
+require conf/machine/include/tune-strongarm.inc
-require conf/machine/include/tune-strongarm1100.inc
============================================================
--- conf/machine/jornada7xx.conf	b8d6ade022066bbe05995a96ff6dc4c32bb0c5ac
+++ conf/machine/jornada7xx.conf	931f12408f78e84eaafc92103fd2590493bcd246
@@ -1,10 +1,10 @@ TARGET_ARCH = "arm"
 #@TYPE: Machine
 #@NAME: HP Jornada 7xx 
 #@DESCRIPTION: Machine configuration for the SA1100 based HP Jornada 7xx palmtop computer
 
 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"
============================================================
--- conf/machine/shark.conf	45f471879704cfba13dd30daae06942e7bdd6716
+++ conf/machine/shark.conf	8a744b9daf9db02c05297d317225e9f6d6cb012e
@@ -15,7 +15,7 @@ USE_VT = "0"
 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 "
============================================================
--- conf/machine/simpad.conf	b9316853a8b1c9a28a1c4df96b4166a416335cc3
+++ conf/machine/simpad.conf	9987d298771d159fd85308e85bdb5a82fd16832d
@@ -9,7 +9,7 @@ include conf/machine/include/simpad-${MA
 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"