zaurus-2.6.inc: rename into zaurus.inc.

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>

diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 4afa515c3210516717fb75a2f4cf1454acec842c..ae089a17a8578db95951ee222e88441c4ff7c72e 100644 (file)
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -2,7 +2,7 @@
 #@NAME: Sharp Zaurus SL-C1000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
 
-require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus.inc
 require conf/machine/include/tune-xscale.inc
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 

diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 68c9ba4263da3bb8d862e179b3334b01dce23440..f5ec1325a2d63cf1e68a4a6d59af03ee9fb0397b 100644 (file)
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -2,7 +2,7 @@
 #@NAME: Sharp Zaurus SL-C7x0
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
 
-require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus.inc
 require conf/machine/include/tune-xscale.inc
 
 # NAND factory-default

diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 66995e9b09f4980abe603e1d000a091498239e7f..a0d710cbfc11bc518cef209b11178318bd35799f 100644 (file)
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -2,7 +2,7 @@
 #@NAME: Sharp Zaurus SL-5000, Sharp Zaurus SL-5500
 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
 
-require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus.inc
 require conf/machine/include/tune-strongarm.inc
 
 ROOT_FLASH_SIZE = "14"

diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus.inc
similarity index 97%
rename from conf/machine/include/zaurus-2.6.inc
rename to conf/machine/include/zaurus.inc
index ac79cf3c0a7f2244d3a6e61bb14507c6f6dc87f3..a80d283d518de4259792d58a5b7a2411d6c5b6cb 100644 (file)
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus.inc
@@ -91,9 +91,6 @@ CMDLINE_spitz = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1"
 CMDLINE_tosa = "console=ttyS0,115200n8 console=tty1"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2"
-# iwmmxt under testing
-#MACHINE_FEATURES_append_akita = " usbhost iwmmxt "
-#MACHINE_FEATURES_append_spitz = " usbhost iwmmxt "
 MACHINE_FEATURES_append_akita = " usbhost"
 MACHINE_FEATURES_append_spitz = " usbhost"
 MACHINE_FEATURES_append_tosa  = " usbhost wifi "

diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index db7a7809a793f43077f8f3692fafab1dfb6db67e..d1bcb154b2d72455ffc510db4536a93964393324 100644 (file)
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -2,7 +2,7 @@
 #@NAME: Sharp Zaurus SL-B500, Sharp Zaurus SL-5600
 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
 
-require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus.inc
 require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "22"

diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 0b5331eb44ed9c53d1373017681232e9d7573781..4019bca4fbd841fd51ea186e23710b1fcd8950ad 100644 (file)
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -2,7 +2,7 @@
 #@NAME: Sharp Zaurus SL-C3000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
 
-require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus.inc
 require conf/machine/include/tune-xscale.inc
 
 MACHINE_FEATURES += "iwmmxt"

diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index fd1e477465695edc57d59433127ddaf7f8b71aff..ab12b8bd563f7a0bb21e3bd22390c0c021dac2d6 100644 (file)
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -2,7 +2,7 @@
 #@NAME: Sharp Zaurus SL-6000
 #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device
 
-require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus.inc
 require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "28"