From af03b40d8e39aa612bab5b3d3d5996c7b8a6020d Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 23 Oct 2005 23:45:39 +0000 Subject: add support for more network devices, start menuconfig reorg. git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2294 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/linux-2.4/Makefile | 43 ++++++++++++++++++++++++++++--- target/linux/linux-2.4/config/x86 | 37 ++++++++++++++++---------- target/linux/linux-2.4/config/x86.modules | 2 +- target/linux/linux-2.4/x86.mk | 5 +--- 4 files changed, 66 insertions(+), 21 deletions(-) (limited to 'target/linux/linux-2.4') diff --git a/target/linux/linux-2.4/Makefile b/target/linux/linux-2.4/Makefile index 2b8a186fc3..2fdf1ebb58 100644 --- a/target/linux/linux-2.4/Makefile +++ b/target/linux/linux-2.4/Makefile @@ -187,16 +187,53 @@ endif $(eval $(call KMOD_template,SCHED,sched,\ $(MODULES_DIR)/kernel/net/sched/*.o \ ,CONFIG_SCHED)) + $(eval $(call KMOD_template,VIDEODEV,videodev,\ $(MODULES_DIR)/kernel/drivers/media/video/videodev.o \ -,CONFIG_VIDEO_DEV)) +,CONFIG_VIDEO_DEV,,62,videodev)) + $(eval $(call KMOD_template,PWC,pwc,\ $(MODULES_DIR)/kernel/drivers/usb/pwc.o \ -,CONFIG_USB_PWC)) +,CONFIG_USB_PWC,kmod-videodev,63,pwc)) + $(eval $(call KMOD_template,AX25,ax25,\ $(MODULES_DIR)/kernel/net/ax25/ax25.o \ $(MODULES_DIR)/kernel/drivers/net/hamradio/mkiss.o \ -,CONFIG_AX25)) +,CONFIG_AX25,,90,ax25 mkiss)) + +$(eval $(call KMOD_template,NET_3C59X,net-3c59x,\ + $(MODULES_DIR)/kernel/drivers/net/3c59x.o \ +,CONFIG_VORTEX,,10,3c59x)) + +$(eval $(call KMOD_template,NET_8139TOO,net-8139too,\ + $(MODULES_DIR)/kernel/drivers/net/8139too.o \ + $(MODULES_DIR)/kernel/drivers/net/mii.o \ +,CONFIG_VORTEX,,10,mii 8139too)) + +$(eval $(call KMOD_template,NET_AIRO,net-airo,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/airo.o \ +,CONFIG_AIRO,,10,airo)) + +$(eval $(call KMOD_template,NET_HERMES,net-hermes,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/hermes.o \ + $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.o \ +,CONFIG_HERMES,,10,hermes orinoco)) + +$(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-pci,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_pci.o \ +,CONFIG_PCI_HERMES,kmod-net-hermes,11,orinoco_pci)) + +$(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-plx,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.o \ +,CONFIG_PLX_HERMES,kmod-net-hermes,11,orinoco_plx)) + +$(eval $(call KMOD_template,NET_NATSEMI,net-natsemi,\ + $(MODULES_DIR)/kernel/drivers/net/natsemi.o \ +,CONFIG_NATSEMI,,10,natsemi)) + +$(eval $(call KMOD_template,NET_PRISM54,net-prism54,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.o \ +,CONFIG_PRISM54,,10,prism54)) $(TARGETS): $(PACKAGE_DIR) diff --git a/target/linux/linux-2.4/config/x86 b/target/linux/linux-2.4/config/x86 index 92892b180e..fbae7653b0 100644 --- a/target/linux/linux-2.4/config/x86 +++ b/target/linux/linux-2.4/config/x86 @@ -671,7 +671,17 @@ CONFIG_NET_ETHERNET=y # CONFIG_SUNBMAC is not set # CONFIG_SUNQE is not set # CONFIG_SUNGEM is not set -# CONFIG_NET_VENDOR_3COM is not set +CONFIG_NET_VENDOR_3COM=y +# CONFIG_EL1 is not set +# CONFIG_EL2 is not set +# CONFIG_ELPLUS is not set +# CONFIG_EL16 is not set +# CONFIG_EL3 is not set +# CONFIG_3C515 is not set +# CONFIG_ELMC is not set +# CONFIG_ELMC_II is not set +CONFIG_VORTEX=m +# CONFIG_TYPHOON is not set # CONFIG_LANCE is not set # CONFIG_NET_VENDOR_SMC is not set # CONFIG_NET_VENDOR_RACAL is not set @@ -702,7 +712,7 @@ CONFIG_NATSEMI=m # CONFIG_NE3210 is not set # CONFIG_ES3210 is not set # CONFIG_8139CP is not set -# CONFIG_8139TOO is not set +CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set # CONFIG_8139TOO_8129 is not set @@ -754,11 +764,11 @@ CONFIG_NET_RADIO=y # CONFIG_AIRONET4500 is not set # CONFIG_AIRONET4500_NONCS is not set # CONFIG_AIRONET4500_PROC is not set -# CONFIG_AIRO is not set -# CONFIG_HERMES is not set -# CONFIG_PLX_HERMES is not set +CONFIG_AIRO=m +CONFIG_HERMES=m +CONFIG_PLX_HERMES=m # CONFIG_TMD_HERMES is not set -# CONFIG_PCI_HERMES is not set +CONFIG_PCI_HERMES=m # # Wireless Pcmcia cards support @@ -770,7 +780,8 @@ CONFIG_NET_RADIO=y # # Prism54 PCI/PCMCIA GT/Duette Driver - 802.11(a/b/g) # -# CONFIG_PRISM54 is not set +CONFIG_PRISM54=m +CONFIG_FW_LOADER=m CONFIG_NET_WIRELESS=y # @@ -1079,10 +1090,10 @@ CONFIG_NLS=y # Native Language Support # CONFIG_NLS_DEFAULT="iso8859-1" -# CONFIG_NLS_CODEPAGE_437 is not set +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set -# CONFIG_NLS_CODEPAGE_850 is not set +CONFIG_NLS_CODEPAGE_850=m # CONFIG_NLS_CODEPAGE_852 is not set # CONFIG_NLS_CODEPAGE_855 is not set # CONFIG_NLS_CODEPAGE_857 is not set @@ -1102,7 +1113,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set -# CONFIG_NLS_ISO8859_1 is not set +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set @@ -1112,10 +1123,10 @@ CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NLS_ISO8859_9 is not set # CONFIG_NLS_ISO8859_13 is not set # CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set +CONFIG_NLS_ISO8859_15=m # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set -# CONFIG_NLS_UTF8 is not set +CONFIG_NLS_UTF8=m # # Multimedia devices @@ -1401,4 +1412,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m # CONFIG_CRC32 is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y -# CONFIG_FW_LOADER is not set +CONFIG_FW_LOADER=m diff --git a/target/linux/linux-2.4/config/x86.modules b/target/linux/linux-2.4/config/x86.modules index 7fd95a5d38..8b13789179 100644 --- a/target/linux/linux-2.4/config/x86.modules +++ b/target/linux/linux-2.4/config/x86.modules @@ -1 +1 @@ -natsemi + diff --git a/target/linux/linux-2.4/x86.mk b/target/linux/linux-2.4/x86.mk index 8b308a0a52..0753b10cce 100644 --- a/target/linux/linux-2.4/x86.mk +++ b/target/linux/linux-2.4/x86.mk @@ -1,10 +1,7 @@ # $Id$ -# soekris specific kmod packages +# x86 specific kmod packages -$(eval $(call KMOD_template,NATSEMI,natsemi,\ - $(MODULES_DIR)/kernel/drivers/net/natsemi.o \ -,CONFIG_NATSEMI)) $(eval $(call KMOD_template,WD1100,wd1100,\ $(MODULES_DIR)/kernel/drivers/char/wd1100.o \ ,CONFIG_WD1100)) -- cgit v1.2.3