7 files changed, 19 insertions, 25 deletions
diff --git a/conf/machine/poodle-2.6.conf b/conf/machine/poodle-2.6.conf
index e69de29bb2..72a751d19e 100644
--- a/conf/machine/poodle-2.6.conf
+++ b/conf/machine/poodle-2.6.conf
@@ -0,0 +1,6 @@
+PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+PREFERRED_VERSION_orinoco-modules = "0.13e-26"
+
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils modutils-collateral hostap-modules orinoco-modules"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils"
+
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index 458ee554bd..3bd9f5f076 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -14,8 +14,9 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n"
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
 
 include conf/machine/handheld-common.conf
-# not using tune-xscale.conf so as to retain backwards compatibility
-include conf/machine/tune-strongarm.conf
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/tune-xscale.conf
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
diff --git a/conf/machine/tosa-2.4.conf b/conf/machine/tosa-2.4.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/tosa-2.4.conf
diff --git a/conf/machine/tosa-2.6.conf b/conf/machine/tosa-2.6.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/tosa-2.6.conf
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index be495925c1..f742bed742 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -4,24 +4,9 @@
 
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
-BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel hostap-modules \
-			    orinoco-modules sharp-sdmmc-support usbutils"
-BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm \
-			     kernel-module-evdev kernel-module-net-fd \
-			     kernel-module-pxa-bi kernel-module-registers \
-			     kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \
-			     kernel-module-usb-storage \
-			     kernel hostap-modules-cs orinoco-modules-cs \
-			     sharp-sdmmc-support kernel-module-pxa-bi \
-			     kernel-module-ip-gre \
-			     kernel-module-irnet kernel-module-ipip kernel-module-usbcore \
-			     kernel-module-usbdcore kernel-module-usbdmonitor"
-
-RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd \
-		kernel-module-usbmouse kernel-module-hid usbutils \
-		kernel-module-evdev"
+
+KERNEL_VERSION ?= "2.4"
+include conf/machine/tosa-${KERNEL_VERSION}.conf
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
 
@@ -31,7 +16,8 @@ GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_DEPENDS += "gaim"
 
 include conf/machine/handheld-common.conf
-# not using tune-xscale.conf so as to retain backwards compatibility
-include conf/machine/tune-strongarm.conf
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/tune-xscale.conf
 
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf
index 530d12af0b..e408c5c86e 100644
--- a/conf/machine/zaurus-clamshell-2.6.conf
+++ b/conf/machine/zaurus-clamshell-2.6.conf
@@ -1,6 +1,6 @@
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
-PREFERRED_VERSION_orinoco-modules = "cvs"
+PREFERRED_VERSION_orinoco-modules = "0.13e-26"
 
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils hostap-modules    orinoco-modules \
 pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"
diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf
index 9246d45197..e0b8d31349 100644
--- a/conf/machine/zaurus-clamshell.conf
+++ b/conf/machine/zaurus-clamshell.conf
@@ -16,7 +16,8 @@ GPE_EXTRA_DEPENDS += "gaim sylpheed"
 GPE_EXTRA_INSTALL += "gaim sylpheed"
 
 include conf/machine/handheld-common.conf
-# not using tune-xscale.conf so as to retain backwards compatibility
-include conf/machine/tune-strongarm.conf
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/tune-xscale.conf
 
 SERIAL_CONSOLE = "115200 ttyS0"