switched to 'update-modules' method of handling modules on collie

BKrev: 410c38b9yoqIds0E6jrz6cTpnaBDQQ

diff --git a/conf/collie.conf b/conf/collie.conf
index f84f1cd..22007a6 100644 (file)
--- a/conf/collie.conf
+++ b/conf/collie.conf
@@ -6,8 +6,8 @@ TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support \
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils hostap-modules orinoco-modules sharp-sdmmc-support \
 kernel-module-devinfo kernel-module-gpio kernel-module-net-fd kernel-module-registers kernel-module-sa1100-bi \
 kernel-module-usbdcore kernel-module-usbdmonitor " 
 

diff --git a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
index 49c336d..c152ed0 100644 (file)
--- a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
+++ b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
@@ -44,6 +44,10 @@ KERNEL_LDSUFFIX = "-2.11.2"
 COMPATIBLE_HOST = "arm.*-linux"
 EXTRA_OEMAKE = ""
 
+module_conf_usbdmonitor = "alias usbd0 usbdmonitor"
+module_conf_sa1100_bi = "below sa1100_bi net_fd usbdcore "
+module_autoload_sa1100_bi = "sa1100_bi"
+
 #
 # FIXME: Use configuration system
 #