Merge bk://openembedded@openembedded.bkbits.net/packages

into home.hrw.one.pl:/home/szczepan/zaurus/oe/packages

2004/08/03 19:46:12+02:00 hrw.one.pl!hrw
switched to 'update-modules' method of handling modules on PXA zaurus models

BKrev: 410fcf72WOQ14z4dX3erl1r2XgWi6g

diff --git a/conf/zaurus-pxa.conf b/conf/zaurus-pxa.conf
index 3108154..a58107a 100644 (file)
--- a/conf/zaurus-pxa.conf
+++ b/conf/zaurus-pxa.conf
@@ -2,10 +2,10 @@ TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support chkhinge"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support chkhinge"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules orinoco-modules sharp-sdmmc-support \
 kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
-kernel-module-usbdcore kernel-module-usbdmonitor modutils-collateral chkhinge"
+kernel-module-usbdcore kernel-module-usbdmonitor modutils chkhinge"
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
 EXTRA_IMAGEDEPENDS = "sharp-flash-header-c700"

diff --git a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
index e6e672c..cc70e50 100644 (file)
--- a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
+++ b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
@@ -52,6 +52,10 @@ KERNEL_CCSUFFIX = "-2.95"
 KERNEL_LDSUFFIX = "-2.11.2"
 COMPATIBLE_HOST = "arm.*-linux"
 
+module_conf_usbdmonitor = "alias usbd0 usbdmonitor"
+module_conf_pxa_bi = "below pxa_bi net_fd usbdcore "
+module_autoload_pxa_bi = "pxa_bi"
+
 do_configure_prepend() {
        install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
 }