summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
Diffstat (limited to 'linux')
-rw-r--r--linux/montavista-sa-2.4.17-mvl21/defconfig-beagle10
-rw-r--r--linux/montavista-sa_2.4.17-mvl21.oe13
2 files changed, 17 insertions, 6 deletions
diff --git a/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle b/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
index e9e3658ab7..e2fe0a5f91 100644
--- a/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
+++ b/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
@@ -407,18 +407,18 @@ CONFIG_PPP_BSDCOMP=m
#
CONFIG_NET_RADIO=y
# CONFIG_STRIP is not set
-CONFIG_WAVELAN=m
+# CONFIG_WAVELAN is not set
# CONFIG_ARLAN is not set
# CONFIG_AIRONET4500 is not set
# CONFIG_AIRONET4500_NONCS is not set
# CONFIG_AIRONET4500_PROC is not set
-CONFIG_HERMES=m
+# CONFIG_HERMES is not set
#
# Wireless Pcmcia cards support
#
-CONFIG_PCMCIA_HERMES=m
-CONFIG_AIRO_CS=m
+# CONFIG_PCMCIA_HERMES is not set
+# CONFIG_AIRO_CS is not set
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=m
+CONFIG_PCMCIA_PCNET=y
# CONFIG_PCMCIA_AXNET is not set
# CONFIG_PCMCIA_NMCLAN is not set
# CONFIG_PCMCIA_SMC91C92 is not set
diff --git a/linux/montavista-sa_2.4.17-mvl21.oe b/linux/montavista-sa_2.4.17-mvl21.oe
index 43f93bad71..82893c797b 100644
--- a/linux/montavista-sa_2.4.17-mvl21.oe
+++ b/linux/montavista-sa_2.4.17-mvl21.oe
@@ -3,7 +3,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
KV = "${@oe.data.getVar('PV',d,True).split('-')[0]}"
MVLV = "${@oe.data.getVar('PV',d,True).split('-')[1]}"
-PR = "r5"
+PR = "r6"
DEPENDS = "cetools-native"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/montavista-sa-${PV}"
@@ -31,6 +31,17 @@ COMPATIBLE_HOST = "arm.*-linux"
EXTRA_OEMAKE = ""
+module_conf_sa1100_ir = "alias irda0 sa1100_ir"
+module_conf_pcmcia_core = "options pcmcia_core ignore_cis_vcc=1"
+module_conf_ppp_async = "alias ppp0 ppp_async"
+module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1"
+module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1"
+module_conf_spectrum_cs = "options spectrum_cs ignore_cis_vcc=1"
+
+module_conf_usbdmonitor = "alias usbd0 usbdmonitor"
+module_conf_sa1100_bi = "below sa1100_bi net_fd usbdcore "
+module_autoload_sa1100_bi = "sa1100_bi"
+
do_configure_prepend() {
install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config