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

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/09/12 18:22:50+02:00 uni-frankfurt.de!mickeyl
add wrt54 oe distribution configuration

2004/09/12 18:15:14+02:00 uni-frankfurt.de!mickeyl
minor beagle kernel/module adjustments

2004/09/12 17:34:14+02:00 uni-frankfurt.de!mickeyl
make openzaurus-3.5.1.conf include openzaurus.conf

BKrev: 4144bf605L92AwYqgblqXdlYehYHyg

diff --git a/conf/beagle.conf b/conf/beagle.conf
index 38bd99b..8e0b35b 100644 (file)
--- a/conf/beagle.conf
+++ b/conf/beagle.conf
@@ -9,7 +9,10 @@ PREFERRED_PROVIDER_virtual/kernel = "montavista-sa"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils-collateral hostap-modules-cs orinoco-modules \
 kernel-module-net-fd \
-kernel-module-sa1100-bi kernel-module-usbdcore kernel-module-usbdmonitor " 
+kernel-module-sa1100-bi kernel-module-usbdcore kernel-module-usbdmonitor \
+kernel-module-pcnet_cs kernel-module-8390"
+
+# FIXME: the modules list is not complete yet!
 
 EXTRA_IMAGECMD_jffs2 = "--pad=0xec0000 --little-endian --eraseblock=0x40000"
 EXTRA_IMAGEDEPENDS = "cetools-native"

diff --git a/conf/openzaurus-3.5.1.conf b/conf/openzaurus-3.5.1.conf
index 705f872..47d4736 100644 (file)
--- a/conf/openzaurus-3.5.1.conf
+++ b/conf/openzaurus-3.5.1.conf
@@ -1,16 +1,20 @@
-CVSDATE = 20040912
+include conf/openzaurus.conf
+
+CVSDATE = 20040913
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
 PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-DISTRO = "openzaurus"
+
 OEINCLUDELOGS = "yes"
 KERNEL_CONSOLE = "tty1"
 TARGET_FPU = "soft"
 #DEBUG_OPTIMIZATION = "-O -g3"
 #DEBUG_BUILD = "1"
 #INHIBIT_PACKAGE_STRIP = "1"
+
 PREFERRED_VERSION_binutils-cross = "2.15.91.0.1"
 PREFERRED_VERSION_qte-for-opie = "2.3.7"
+PREFERRED_VERSION_orinoco-modules = "0.13e"

diff --git a/conf/wrt54oe.conf b/conf/wrt54oe.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle b/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
index 9fc593c..e9e3658 100644 (file)
--- a/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
+++ b/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
@@ -318,12 +318,12 @@ CONFIG_BLK_DEV_PRD_SIZE=5120
 #
 # Networking options
 #
-CONFIG_PACKET=y
+CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
 # CONFIG_NETLINK_DEV is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_FILTER is not set
-CONFIG_UNIX=y
+CONFIG_UNIX=m
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
@@ -407,18 +407,18 @@ CONFIG_PPP_BSDCOMP=m
 #
 CONFIG_NET_RADIO=y
 # CONFIG_STRIP is not set
-# CONFIG_WAVELAN is not set
+CONFIG_WAVELAN=m
 # CONFIG_ARLAN is not set
 # CONFIG_AIRONET4500 is not set
 # CONFIG_AIRONET4500_NONCS is not set
 # CONFIG_AIRONET4500_PROC is not set
-# CONFIG_HERMES is not set
+CONFIG_HERMES=m
 
 #
 # Wireless Pcmcia cards support
 #
-# CONFIG_PCMCIA_HERMES is not set
-# CONFIG_AIRO_CS is not set
+CONFIG_PCMCIA_HERMES=m
+CONFIG_AIRO_CS=m
 CONFIG_NET_WIRELESS=y
 
 #
@@ -441,7 +441,7 @@ CONFIG_NET_PCMCIA=y
 # CONFIG_PCMCIA_3C589 is not set
 # CONFIG_PCMCIA_3C574 is not set
 # CONFIG_PCMCIA_FMVJ18X is not set
-CONFIG_PCMCIA_PCNET=y
+CONFIG_PCMCIA_PCNET=m
 # CONFIG_PCMCIA_AXNET is not set
 # CONFIG_PCMCIA_NMCLAN is not set
 # CONFIG_PCMCIA_SMC91C92 is not set