zaurus machine configurations: add orinoco-cs to poodle, specify 0.13e for Zaurus...

diff --git a/conf/machine/poodle-2.4.conf b/conf/machine/poodle-2.4.conf
index bb3ae039d919b834b0e2962482595c336106e075..e8be12eef2b168fee95462c0b3bcd9312c1c00f7 100644 (file)
--- a/conf/machine/poodle-2.4.conf
+++ b/conf/machine/poodle-2.4.conf
@@ -1,9 +1,13 @@
 PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
 
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-cs = "0.13e"
+
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel \
-hostap-modules orinoco-modules sharp-sdmmc-support chkhinge \
+hostap-modules orinoco-modules sharp-sdmmc-support \
 hostap-utils prism3-firmware prism3-support"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \
+
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules orinoco-modules-cs sharp-sdmmc-support \
 kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
 kernel-module-usbdcore kernel-module-usbdmonitor \
 hostap-utils prism3-firmware prism3-support"

diff --git a/conf/machine/poodle-2.6.conf b/conf/machine/poodle-2.6.conf
index 72a751d19e2d8e3ba5840f46c143a5f4fdfdcbca..7edebad2d35cd1dfc922d5de5b1dd125f0fb1f2b 100644 (file)
--- a/conf/machine/poodle-2.6.conf
+++ b/conf/machine/poodle-2.6.conf
@@ -1,5 +1,4 @@
 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/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf
index cef670b450a5cf81ce2f327fec3947447eda5568..4f6c56b1820a7e318b3db5819abbfc8d39373c89 100644 (file)
--- a/conf/machine/zaurus-clamshell-2.4.conf
+++ b/conf/machine/zaurus-clamshell-2.4.conf
@@ -2,6 +2,9 @@ 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"
 
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-cs = "0.13e"
+
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \
 pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin \
 hostap-utils prism3-firmware prism3-support"