merge of '1df6d041b2c60bf99f158bc629911c2bd43cb76b'

     and 'f5f0e13e97c221bdaa5281f17bf2ce322fc3ea4b'

7 files changed, 6 insertions, 74 deletions

diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 5685c3d0f3..2682fb300f 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -2,8 +2,8 @@
 #@NAME: Sharp Zaurus SL-C1000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
 
-include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-2.6.conf
+include conf/machine/include/zaurus-clamshell.conf
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
 
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 047e44707c..d1afb882e3 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -2,8 +2,8 @@
 #@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
 
-include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-2.6.conf
+include conf/machine/include/zaurus-clamshell.conf
 
 IMAGE_FSTYPES ?= "jffs2"
 
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 0eb733bfb5..0f8ed6ed82 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -15,7 +15,7 @@ require conf/machine/include/tune-xscale.conf
 #require conf/machine/include/tune-iwmmxt.conf
 
 GUI_MACHINE_CLASS = "bigscreen"
-MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen"
+MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth"
 
 #
 # Software/packages selection
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
deleted file mode 100644
index edd68c08f8..0000000000
--- a/conf/machine/ipaq-pxa270.conf
+++ /dev/null
@@ -1,68 +0,0 @@
-#@TYPE: Machine
-#@NAME: iPAQ hx47xx hx2xxx
-#@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU  devices
-
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700"
-#use this for a hx47xx ipaq
-PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
-
-#use this for a hx2xxx ipaq
-#PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-
-PREFERRED_VERSION_orinoco-modules = "0.15rc1"
-
-ROOT_FLASH_SIZE = "80"
-
-EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-			  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
-			  -e 256KiB -p"
-
-IMAGE_FSTYPES ?= "jffs2"
-
-MODUTILS = "26"	
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget"
-
-PCMCIA_MANAGER = "pcmciautils"
-BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${HX4700_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}"
-BOOTSTRAP_EXTRA_RDEPENDS = "tiinit acx-firmware"
-
-PXA270_MODULES = "nls_cp437 nls_iso8859-1 nls_utf8 af_key"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-
-GUI_MACHINE_CLASS = "bigscreen"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
-
-# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#include conf/machine/include/tune-iwmmxt.conf
-
-
-# These modules are now compiled into the kernel:
-#HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt \
-#                  hx4700_pcmcia hx4700_ts hx4700_power"
-
-HX4700_MODULES = "i2c-pxa hx4700_voltage hx4700_acx snd_hx4700_audio"
-
-
-module_autoload_evdev = "evdev"
-module_autoload_hx4700_power = "hx4700_power"
-module_autoload_pcmcia = "pcmcia"
-module_autoload_hx4700_pcmcia = "hx4700_pcmcia"
-module_autoload_asic3_mmc = "asic3_mmc"
-module_autoload_mmc_block = "mmc_block"
-module_autoload_hx4700_ts = "hx4700_ts"
-module_autoload_hx4700_navpt = "hx4700_navpt"
-module_autoload_hx4700_bt = "hx4700_bt"
-module_autoload_snd-hx4700_audio = "snd-hx4700_audio"
-module_autoload_snd-pcm-oss = "snd-pcm-oss"
-module_autoload_snd-mixer-oss = "snd-mixer-oss"
-module_autoload_pxa27x_udc = "pxa27x_udc"
-
-#FIXME: this should be controlled by a userspace utility later.
-module_autoload_g_ether = "g_ether"
diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf
index 5108623750..700f7995fb 100644
--- a/conf/machine/ixp4xxbe.conf
+++ b/conf/machine/ixp4xxbe.conf
@@ -7,7 +7,7 @@ MACHINE_FEATURES = "kernel26 usbhost ext2"
 ARCH_BYTE_SEX = "be"
 include conf/machine/include/ixp4xx.conf
 
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}"
+PACKAGE_EXTRA_ARCHS = "armv4eb armv4teb armv5eb armv5teb ixp4xxeb"
 
 EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 --faketime -n"
 
diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf
index ac62d669e5..347c7ba3fb 100644
--- a/conf/machine/ixp4xxle.conf
+++ b/conf/machine/ixp4xxle.conf
@@ -7,7 +7,7 @@ MACHINE_FEATURES = "kernel26 usbhost ext2"
 ARCH_BYTE_SEX = "le"
 include conf/machine/include/ixp4xx.conf
 
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle"
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 --faketime -n"
 
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 9a54643b3f..455ae56677 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -2,8 +2,8 @@
 #@NAME: Sharp Zaurus SL-C3000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
 
-include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-2.6.conf
+include conf/machine/include/zaurus-clamshell.conf
 
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"