summaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-19 04:35:29 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-19 04:35:29 +0000
commit4c98f8465d7b207b150b3c67705e35297d7804be (patch)
tree5a337e497d0d20261e5b4c22d43436323f601fef /package/kernel
parent00b9fc10fe104cb6b4c835fdf19f739121722ed6 (diff)
finally kill KMOD_template - removes a big chunk of legacy build code
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5222 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/Makefile22
-rw-r--r--package/kernel/modules/network.mk36
-rw-r--r--package/kernel/modules/other.mk100
-rw-r--r--package/kernel/modules/usb.mk23
-rw-r--r--package/kernel/modules/wireless.mk109
5 files changed, 253 insertions, 37 deletions
diff --git a/package/kernel/Makefile b/package/kernel/Makefile
index 37cb13e16..a030ad723 100644
--- a/package/kernel/Makefile
+++ b/package/kernel/Makefile
@@ -32,5 +32,27 @@ endef
define Build/Compile
endef
+CONFIG_PACKAGE_kernel=y
+define Package/kernel
+ SECTION:=sys
+ CATEGORY:=Kernel
+ DEFAULT:=y
+ TITLE:=Virtual kernel package
+ DESCRIPTION:=Virtual kernel package
+ VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)
+endef
+
+define Package/kernel/install
+ # nothing to do
+endef
+
+# this is more robust than ifdef around eval/call
+ifneq ($(DUMP),1)
+ define BuildKernel
+ $(call BuildPackage,kernel)
+ endef
+endif
+$(eval $(call BuildKernel))
+
include $(TOPDIR)/target/linux/*/modules.mk
include ./modules/*.mk
diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 16a8d69b3..4c82c4cc0 100644
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -219,33 +219,19 @@ endef
$(eval $(call KernelPackage,sched))
-define KernelPackage/ieee80211softmac
- TITLE:=802.11 Networking stack
- DESCRIPTION:=\\\
- \\\
- Includes: \\\
- - ieee80211_crypt \\\
- - ieee80211 \\\
- - ieee80211_crypt_wep \\\
- - ieee80211_crypt_tkip \\\
- - ieee80211_crytp_ccmp \\\
- - ieee80211softmac
- DEPENDS:=@LINUX_2_6
- KCONFIG:=$(CONFIG_IEEE80211_SOFTMAC)
- FILES:= \
- $(MODULES_DIR)/kernel/net/ieee80211/*.$(LINUX_KMOD_SUFFIX) \
- $(MODULES_DIR)/kernel/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,10, \
- ieee80211_crypt \
- ieee80211 \
- ieee80211_crypt_wep \
- ieee80211_crypt_tkip \
- ieee80211_crypt_ccmp \
- ieee80211softmac \
- )
+
+define KernelPackage/ax25
+ TITLE:=AX25 support
+ DESCRIPTION:=Kernel modules for AX25 support
SUBMENU:=$(NSMENU)
+ KCONFIG:=$(CONFIG_AX25)
+ FILES:= \
+ $(MODULES_DIR)/kernel/net/ax25/ax25.$(LINUX_KMOD_SUFFIX) \
+ $(MODULES_DIR)/kernel/drivers/net/hamradio/mkiss.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,80,ax25 mkiss)
endef
-$(eval $(call KernelPackage,ieee80211softmac))
+$(eval $(call KernelPackage,ax25))
+
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 97cfddb9e..cf66deea4 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -120,3 +120,103 @@ endef
$(eval $(call KernelPackage,nbd))
+define KernelPackage/pcmcia-core
+ TITLE:=PCMCIA/CardBus support
+ DESCRIPTION:=Kernel support for PCMCIA/CardBus controllers
+ SUBMENU:=$(EMENU)
+ KCONFIG:=$(CONFIG_PCMCIA)
+endef
+
+define KernelPackage/pcmcia-core/2.4
+ FILES:= \
+ $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
+ $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \
+ $(MODULES_DIR)/kernel/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,40,pcmcia_core yenta_socket ds)
+endef
+
+define KernelPackage/pcmcia-core/2.6
+ FILES:= \
+ $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
+ $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) \
+ $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \
+ $(MODULES_DIR)/kernel/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia yenta_socket rsrc_nonstatic)
+endef
+$(eval $(call KernelPackage,pcmcia-core))
+
+
+define KernelPackage/pcmcia-serial
+ TITLE:=Serial devices support
+ DESCRIPTION:=Kernel support for PCMCIA/CardBus serial devices
+ DEPENDS:=kmod-pcmcia-core
+ SUBMENU:=$(EMENU)
+ AUTOLOAD:=$(call AutoLoad,45,serial_cs)
+endef
+
+define KernelPackage/pcmcia-serial/2.4
+ KCONFIG:=$(CONFIG_PCMCIA_SERIAL_CS)
+ FILES:=$(MODULES_DIR)/kernel/drivers/char/pcmcia/serial_cs.$(LINUX_KMOD_SUFFIX)
+endef
+
+define KernelPackage/pcmcia-serial/2.6
+ KCONFIG:=$(CONFIG_SERIAL_8250_CS)
+ FILES:=$(MODULES_DIR)/kernel/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,pcmcia-serial))
+
+
+define KernelPackage/bluetooth
+ TITLE:=Bluetooth support
+ DESCRIPTION:=Kernel support for Bluetooth devices
+ SUBMENU:=$(EMENU)
+ FILES:= \
+ $(MODULES_DIR)/kernel/net/bluetooth/bluetooth.ko \
+ $(MODULES_DIR)/kernel/net/bluetooth/l2cap.ko \
+ $(MODULES_DIR)/kernel/net/bluetooth/sco.ko \
+ $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm.ko \
+ $(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart.ko \
+ $(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb.ko
+ AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm hci_uart hci_usb)
+endef
+
+define KernelPackage/bluetooth/2.4
+ KCONFIG:=$(CONFIG_BLUEZ)
+endef
+
+define KernelPackage/bluetooth/2.6
+ KCONFIG:=$(CONFIG_BT)
+endef
+$(eval $(call KernelPackage,bluetooth))
+
+
+define KernelPackage/softdog
+ TITLE:=Software watchdog driver
+ DESCRIPTION:=Software watchdog driver
+ SUBMENU:=$(EMENU)
+ KCONFIG:=$(CONFIG_SOFT_WATCHDOG)
+ FILES:=$(MODULES_DIR)/kernel/drivers/char/softdog.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,50,softdog)
+endef
+$(eval $(call KernelPackage,softdog))
+
+
+define KernelPackage/videodev
+ TITLE=Video4Linux support
+ DESCRIPTION:=Kernel modules for Video4Linux support
+ SUBMENU:=$(EMENU)
+ KCONFIG:=$(CONFIG_VIDEO_DEV)
+ FILES:=$(MODULES_DIR)/kernel/drivers/media/video/*.$(LINUX_KMOD_SUFFIX)
+endef
+
+define KernelPackage/videodev/2.4
+ AUTOLOAD:=$(call AutoLoad,60,videodev)
+endef
+
+define KernelPackage/videodev/2.6
+ AUTOLOAD:=$(call AutoLoad,60,v4l2-common videodev)
+endef
+$(eval $(call KernelPackage,videodev))
+
+
+
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 0f196b6ce..b172252c7 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -243,4 +243,25 @@ define KernelPackage/usb-speedtouch
AUTOLOAD:=$(call AutoLoad,70,usbatm speedtch)
endef
$(eval $(call KernelPackage,usb-speedtouch))
-
+
+
+define KernelPackage/usb-pwc
+ $(call usbdep,+kmod-videodev)
+ TITLE:=Philips WebCam driver
+ DESCRIPTION:=Kernel modules for supporting Philips WebCam USB devices
+ KCONFIG:=$(CONFIG_USB_PWC)
+ AUTOLOAD:=$(call AutoLoad,70,pwc)
+endef
+
+define KernelPackage/usb-pwc/2.4
+ FILES:=$(MODULES_DIR)/kernel/drivers/usb/pwc.$(LINUX_KMOD_SUFFIX)
+endef
+
+define KernelPackage/usb-pwc/2.6
+ FILES:=$(MODULES_DIR)/kernel/drivers/usb/media/pwc.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,usb-pwc))
+
+
+
+
diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 73ee125fc..413e353f5 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -8,47 +8,134 @@
WIMENU:=Wireless Drivers
-define KernelPackage/bcm43xx
+define KernelPackage/ieee80211
+ TITLE:=802.11 Networking stack
+ DESCRIPTION:=\\\
+ \\\
+ Includes: \\\
+ - ieee80211_crypt \\\
+ - ieee80211 \\\
+ - ieee80211_crypt_wep \\\
+ - ieee80211_crypt_tkip \\\
+ - ieee80211_crytp_ccmp \\\
+ - ieee80211softmac
+ DEPENDS:=@LINUX_2_6
+ KCONFIG:=$(CONFIG_IEEE80211_SOFTMAC)
+ FILES:= \
+ $(MODULES_DIR)/kernel/net/ieee80211/*.$(LINUX_KMOD_SUFFIX) \
+ $(MODULES_DIR)/kernel/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,10, \
+ ieee80211_crypt \
+ ieee80211 \
+ ieee80211_crypt_wep \
+ ieee80211_crypt_tkip \
+ ieee80211_crypt_ccmp \
+ ieee80211softmac \
+ )
+ SUBMENU:=$(WIMENU)
+endef
+$(eval $(call KernelPackage,ieee80211))
+
+
+define KernelPackage/net-bcm43xx
TITLE:=Broadcom BCM43xx driver
DESCRIPTION:=\\\
\\\
Includes: \\\
- bcm43xx
- DEPENDS:=kmod-ieee80211softmac
+ DEPENDS:=kmod-ieee80211
KCONFIG:=$(CONFIG_BCM43XX)
FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call Autoload,50,bcm43xx)
SUBMENU:=$(WIMENU)
endef
-$(eval $(call KernelPackage,bcm43xx))
+$(eval $(call KernelPackage,net-bcm43xx))
-define KernelPackage/ipw2100
- TITLE:=Intel IPw2100 driver
+define KernelPackage/net-ipw2100
+ TITLE:=Intel IPW2100 driver
DESCRIPTION:=\\\
\\\
Includes: \\\
- ipw2100
- DEPENDS:=kmod-ieee80211softmac
+ DEPENDS:=kmod-ieee80211
KCONFIG:=$(CONFIG_IPW2100)
FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call Autoload,50,ipw2100)
SUBMENU:=$(WIMENU)
endef
-$(eval $(call KernelPackage,ipw2100))
+$(eval $(call KernelPackage,net-ipw2100))
-define KernelPackage/ipw2200
- TITLE:=Intel IPw2200 driver
+define KernelPackage/net-ipw2200
+ TITLE:=Intel IPW2200 driver
DESCRIPTION:=\\\
\\\
Includes: \\\
- ipw2200
- DEPENDS:=kmod-ieee80211softmac
+ DEPENDS:=kmod-ieee80211
KCONFIG:=$(CONFIG_IPW2200)
FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call Autoload,50,ipw2200)
SUBMENU:=$(WIMENU)
endef
-$(eval $(call KernelPackage,ipw2200))
+$(eval $(call KernelPackage,net-ipw2200))
+
+
+define KernelPackage/net-airo
+ TITLE:=Cisco Aironet driver
+ DESCRIPTION:=Driver for Cisco Aironet cards
+ KCONFIG:=$(CONFIG_AIRO)
+ SUBMENU:=$(WIMENU)
+ FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,50,airo)
+endef
+$(eval $(call KernelPackage,net-airo))
+
+
+define KernelPackage/net-hermes
+ TITLE:=Hermes 802.11b chipset support
+ DESCRIPTION:=Kernel support for Hermes 802.11b chipsets
+ KCONFIG:=$(CONFIG_HERMES)
+ SUBMENU:=$(WIMENU)
+ FILES:= \
+ $(MODULES_DIR)/kernel/drivers/net/wireless/hermes.$(LINUX_KMOD_SUFFIX) \
+ $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,50,hermes orinoco)
+endef
+$(eval $(call KernelPackage,net-hermes))
+
+
+define KernelPackage/net-hermes-pci
+ TITLE:=Intersil Prism 2.5 PCI support
+ DESCRIPTION:=Kernel modules for Intersil Prism 2.5 PCI support
+ KCONFIG:=$(CONFIG_PCI_HERMES)
+ DEPENDS:=kmod-net-hermes
+ SUBMENU:=$(WIMENU)
+ FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_pci.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
+endef
+$(eval $(call KernelPackage,net-hermes-pci))
+
+define KernelPackage/net-hermes-plx
+ TITLE:=PLX9052 based PCI adaptor
+ DESCRIPTION:=Kernel modules for Hermes in PLX9052 based PCI adaptors
+ KCONFIG:=$(CONFIG_PLX_HERMES)
+ DEPENDS:=kmod-net-hermes
+ SUBMENU:=$(WIMENU)
+ FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
+endef
+$(eval $(call KernelPackage,net-hermes-plx))
+
+
+define KernelPackage/net-prism54
+ TITLE:=Intersil Prism54 support
+ DESCRIPTION:=Kernel modules for Intersil Prism54 support
+ KCONFIG:=$(CONFIG_PRISM54)
+ SUBMENU:=$(WIMENU)
+ FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,prism54)
+endef
+$(eval $(call KernelPackage,net-prism54))