5 files changed, 8 insertions, 79 deletions
diff --git a/conf/machine/include/poodle-2.4.conf b/conf/machine/include/poodle-2.4.conf
deleted file mode 100644
index cbf150f3ec..0000000000
--- a/conf/machine/include/poodle-2.4.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
-
-# Later versions are broken on kernel 2.4
-PREFERRED_VERSION_orinoco-modules = "0.13e"
-
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs   sharp-sdmmc-support \
-hostap-utils prism3-firmware prism3-support"
-BOOTSTRAP_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
-kernel-module-usbdcore kernel-module-usbdmonitor" 
-
diff --git a/conf/machine/include/tosa-2.4.conf b/conf/machine/include/tosa-2.4.conf
deleted file mode 100644
index 2fad9b2d91..0000000000
--- a/conf/machine/include/tosa-2.4.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
-
-# Later versions are broken on kernel 2.4
-PREFERRED_VERSION_orinoco-modules = "0.13e"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils keymaps \
-				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 hostap-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 kernel-module-usb-storage"
-
-RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd \
-				kernel-module-usbmouse kernel-module-hid usbutils \
-				kernel-module-evdev"
-
diff --git a/conf/machine/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf
deleted file mode 100644
index 75de007233..0000000000
--- a/conf/machine/include/zaurus-clamshell-2.4.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-# Zaurus Clamshell specific configuration for kernel 2.4
-# Don't forget to include zaurus-clamshell.conf as well
-
-PREFERRED_PROVIDERS_append_c7x0   = " virtual/kernel:c7x0-kernels-2.4-embedix"
-PREFERRED_PROVIDERS_append_akita  = " virtual/kernel:openzaurus-pxa27x"
-PREFERRED_PROVIDERS_append_spitz  = " virtual/kernel:openzaurus-pxa27x"
-PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x"
-
-# Later versions are broken on kernel 2.4
-PREFERRED_VERSION_orinoco-modules = "0.13e"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs  sharp-sdmmc-support \
-pcmcia-cs apmd apm wireless-tools keymaps irda-utils hostap-utils prism3-firmware prism3-support \
-wpa-supplicant-nossl ppp ppp-dialin "
-
-# Misc Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-net-fd kernel-module-registers"
-
-# USB Client Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbdcore kernel-module-usbdmonitor"
-
-# Bluetooth Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluez kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
-                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
-                             kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs \
-                             kernel-module-firmware-class kernel-module-bt3c-cs"
-
-# BI Module
-BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0   = " kernel-module-pxa-bi"
-BOOTSTRAP_EXTRA_RDEPENDS_append_spitz  = " kernel-module-pxa27x-bi"
-BOOTSTRAP_EXTRA_RDEPENDS_append_akita  = " kernel-module-pxa27x-bi"
-BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-pxa27x-bi"
-
-# USB Host Modules
-BOOTSTRAP_EXTRA_RDEPENDS_append_spitz  = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
-                                           kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
-                                           kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
-BOOTSTRAP_EXTRA_RDEPENDS_append_akita  = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
-                                           kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
-                                           kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
-BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
-                                           kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
-                                           kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
-
-GPE_EXTRA_INSTALL += "chkhinge"
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index c904372535..c17da96dd4 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -5,8 +5,8 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
-MACHINE_KERNEL_VERSION ?= "2.4"
-include conf/machine/include/poodle-${MACHINE_KERNEL_VERSION}.conf
+MACHINE_KERNEL_VERSION = "2.6"
+require conf/machine/include/zaurus-2.6.conf
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" 
 
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index 1d7b04e24e..9f720404db 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -5,8 +5,12 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
-MACHINE_KERNEL_VERSION ?= "2.6"
-include conf/machine/include/tosa-${MACHINE_KERNEL_VERSION}.conf
+MACHINE_KERNEL_VERSION = "2.6"
+
+include conf/machine/include/zaurus-2.6.conf
+
+# wlan-ng Modules
+MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"