summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-23 02:41:33 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-23 02:41:33 +0000
commit263c7a706996b2991462fdc47146cb9a7a6ac19f (patch)
treeed6b5f94b2afdf9513567976d39d1e946de056a3
parentfd7d7215c62c223031426b1b84e96cd4186bd148 (diff)
more dependency fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8115 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/kernel-build.mk6
-rw-r--r--package/kernel/modules/block.mk65
-rw-r--r--package/kernel/modules/netfilter.mk1
-rw-r--r--package/kernel/modules/network.mk6
-rw-r--r--package/kernel/modules/other.mk47
-rw-r--r--package/kernel/modules/usb.mk29
-rw-r--r--package/kernel/modules/wireless.mk5
-rwxr-xr-xscripts/metadata.pl2
-rw-r--r--target/Config.in6
9 files changed, 79 insertions, 88 deletions
diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 96fb7fa47b..7a02d5553d 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -23,9 +23,6 @@ ifneq ($(DUMP),)
.SILENT: $(TMP_CONFIG)
endif
-ifneq ($(CONFIG_ATM),)
- FEATURES += atm
-endif
ifneq ($(CONFIG_PCI),)
FEATURES += pci
endif
@@ -35,9 +32,6 @@ endif
ifneq ($(CONFIG_PCMCIA)$(CONFIG_PCCARD),)
FEATURES += pcmcia
endif
-ifneq ($(CONFIG_VIDEO_DEV),)
- FEATURES += video
-endif
# remove duplicates
FEATURES:=$(sort $(FEATURES))
diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index cbba65d81b..cecddda046 100644
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -1,11 +1,70 @@
BLMENU:=Block Devices
+define KernelPackage/ide-core
+ TITLE:=Kernel support for IDE
+ DESCRIPTION:=\
+ Useful for usb mass storage devices (e.g. on WL-HDD)\\\
+ \\\
+ Includes: \\\
+ - ide-core \\\
+ - ide-detect \\\
+ - ide-disk
+ KCONFIG:=CONFIG_IDE
+ SUBMENU:=$(BLMENU)
+endef
+define KernelPackage/ide-core/2.4
+ FILES:= \
+ $(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/ide/ide-detect.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-detect ide-disk)
+endef
+define KernelPackage/ide-core/2.6
+ FILES:= \
+ $(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/ide/ide-detect.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-generic ide-detect ide-disk)
+endef
+$(eval $(call KernelPackage,ide-core))
+
+define KernelPackage/ide-pdc202xx
+ TITLE:=PDC202xx IDE driver
+ SUBMENU:=$(BLMENU)
+ DEPENDS:=@LINUX_2_4
+ KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD
+ FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old)
+endef
+$(eval $(call KernelPackage,ide-pdc202xx))
+
+define KernelPackage/ide-aec62xx
+ TITLE:=AEC62xx IDE driver
+ SUBMENU:=$(BLMENU)
+ KCONFIG:=CONFIG_BLK_DEV_AEC62XX
+ FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,30,aec62xx)
+endef
+$(eval $(call KernelPackage,ide-aec62xx))
+
+define KernelPackage/scsi-core
+ TITLE:=Kernel support for SCSI
+ SUBMENU:=$(BLMENU)
+ KCONFIG:=CONFIG_SCSI CONFIG_BLK_DEV_SD
+ FILES:= \
+ $(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,scsi-core))
+
define KernelPackage/libata
TITLE:=libata
DESCRIPTION:=libata
KCONFIG:=CONFIG_ATA
SUBMENU:=$(BLMENU)
FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX)
+ DEPENDS:=@PCI_SUPPORT @LINUX_2_6
endef
$(eval $(call KernelPackage,libata))
@@ -16,7 +75,7 @@ define KernelPackage/ata-piix
SUBMENU:=$(BLMENU)
AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod ata_piix)
FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX)
- DEPENDS:=+kmod-libata +kmod-ide-core +kmod-scsi-core @PCI_SUPPORT
+ DEPENDS:=+kmod-libata +kmod-ide-core +kmod-scsi-core
endef
$(eval $(call KernelPackage,ata-piix))
@@ -27,6 +86,8 @@ define KernelPackage/pata-artop
SUBMENU:=$(BLMENU)
AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod pata_artop)
FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX)
- DEPENDS:=kmod-libata +kmod-scsi-core @PCI_SUPPORT
+ DEPENDS:=kmod-libata +kmod-scsi-core
endef
$(eval $(call KernelPackage,pata-artop))
+
+
diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index 420615cf9f..c9965a5ca6 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -231,6 +231,7 @@ define KernelPackage/ebtables
TITLE:=Bridge firewalling modules
DESCRIPTION:=\
Kernel modules for Ethernet Bridge firewalling
+ DEPENDS:=@LINUX_2_6
FILES:=$(LINUX_DIR)/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX)
KCONFIG:=CONFIG_BRIDGE_NF_EBTABLES
SUBMENU:=$(NFMENU)
diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 619dc37704..d05ce23675 100644
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -10,9 +10,9 @@ NSMENU:=Network Support
define KernelPackage/atm
TITLE:=ATM support
- DEPENDS:=@ATM_SUPPORT
DESCRIPTION:= \
Kernel modules for ATM support
+ DEPENDS:=@LINUX_2_6
FILES:= \
$(LINUX_DIR)/net/atm/atm.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/net/atm/br2684.$(LINUX_KMOD_SUFFIX)
@@ -38,7 +38,6 @@ define KernelPackage/bonding
TITLE:=Ethernet bonding driver
DESCRIPTION:= \
Kernel module for NIC bonding.
- DEPENDS:=@LINUX_2_6_X86
FILES:=$(LINUX_DIR)/drivers/net/bonding/bonding.$(LINUX_KMOD_SUFFIX)
KCONFIG:=CONFIG_BONDING
SUBMENU:=$(NSMENU)
@@ -208,7 +207,7 @@ define KernelPackage/pppoa
TITLE:=PPPoA support
DESCRIPTION:=\
Kernel modules for PPPoA (PPP over ATM) support
- DEPENDS:=kmod-ppp
+ DEPENDS:=kmod-ppp kmod-atm
KCONFIG:=CONFIG_PPPOATM
FILES:=$(LINUX_DIR)/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,40,pppoatm)
@@ -263,6 +262,7 @@ $(eval $(call KernelPackage,ax25))
define KernelPackage/mp-alg
TITLE:=ECMP caching algorithms
+ DEPENDS:=@LINUX_2_6
DESCRIPTION:= \
Kernel modules that provide several different algorithms for multipath \\\
route selection from the route cache. The iproute "mpath" argument allows \\\
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 9404660e25..782b587222 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -41,51 +41,6 @@ define KernelPackage/crypto
endef
$(eval $(call KernelPackage,crypto))
-define KernelPackage/ide-core
- TITLE:=Kernel support for IDE
- DESCRIPTION:=\
- Useful for usb mass storage devices (e.g. on WL-HDD)\\\
- \\\
- Includes: \\\
- - ide-core \\\
- - ide-detect \\\
- - ide-disk
- KCONFIG:=CONFIG_IDE
- FILES:=$(LINUX_DIR)/drivers/ide/*.$(LINUX_KMOD_SUFFIX)
- SUBMENU:=$(EMENU)
- AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-generic ide-detect ide-disk)
-endef
-$(eval $(call KernelPackage,ide-core))
-
-define KernelPackage/ide-pdc202xx
- TITLE:=PDC202xx IDE driver
- SUBMENU:=$(EMENU)
- DEPENDS:=@LINUX_2_4
- KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD
- FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old)
-endef
-$(eval $(call KernelPackage,ide-pdc202xx))
-
-define KernelPackage/ide-aec62xx
- TITLE:=AEC62xx IDE driver
- SUBMENU:=$(EMENU)
- KCONFIG:=CONFIG_BLK_DEV_AEC62XX
- FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,30,aec62xx)
-endef
-$(eval $(call KernelPackage,ide-aec62xx))
-
-define KernelPackage/scsi-core
- TITLE:=Kernel support for SCSI
- SUBMENU:=$(EMENU)
- KCONFIG:=CONFIG_SCSI CONFIG_BLK_DEV_SD
- FILES:= \
- $(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX)
-endef
-$(eval $(call KernelPackage,scsi-core))
-
define KernelPackage/lp
TITLE:=Parallel port and line printer support
DEPENDS:=@LINUX_2_4
@@ -278,7 +233,6 @@ $(eval $(call KernelPackage,softdog))
define KernelPackage/videodev
TITLE=Video4Linux support
DESCRIPTION:=Kernel modules for Video4Linux support
- DEPENDS:=@VIDEO_SUPPORT
SUBMENU:=$(EMENU)
KCONFIG:=CONFIG_VIDEO_DEV
FILES:=$(LINUX_DIR)/drivers/media/video/*.$(LINUX_KMOD_SUFFIX)
@@ -340,6 +294,7 @@ $(eval $(call KernelPackage,scx200-wdt))
define KernelPackage/hwmon
TITLE:=Hardware monitoring support
DESCRIPTION:=Kernel modules for hardware monitoring
+ DEPENDS:=@LINUX_2_6
SUBMENU:=$(EMENU)
KCONFIG:=CONFIG_HWMON_VID
FILES:= \
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 5a135b3108..db9e31acf1 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -171,7 +171,7 @@ endef
$(eval $(call KernelPackage,usb-serial))
define KernelPackage/usb-serial-airprime
- $(call usbdep,kmod-usb-serial)
+ $(call usbdep,kmod-usb-serial @LINUX_2_6)
TITLE:=Support for Airprime (EVDO)
DESCRIPTION:=Kernel support for Airprime (EVDO)
KCONFIG:=CONFIG_USB_SERIAL_AIRPRIME
@@ -224,7 +224,7 @@ $(eval $(call KernelPackage,usb-serial-pl2303))
define KernelPackage/usb-serial-sierrawireless
- $(call usbdep,kmod-usb-serial)
+ $(call usbdep,kmod-usb-serial @LINUX_2_6)
TITLE:=Support for Sierra Wireless devices
DESCRIPTION:=Kernel support for Sierra Wireless devices
KCONFIG:=CONFIG_USB_SERIAL_SIERRAWIRELESS
@@ -245,7 +245,7 @@ endef
$(eval $(call KernelPackage,usb-serial-visor))
define KernelPackage/usb-serial-option
- $(call usbdep,kmod-usb-serial)
+ $(call usbdep,kmod-usb-serial @LINUX_2_6)
TITLE:=Support for Option HSDPA modems
DESCRIPTION:=Kernel support for Option HSDPA modems
DEPENDS:=@LINUX_2_6
@@ -315,18 +315,11 @@ endef
$(eval $(call KernelPackage,usb-pwc))
define KernelPackage/cpia2
- $(call usbdep,+kmod-videodev)
+ $(call usbdep,+kmod-videodev @LINUX_2_6)
TITLE:=CPIA2 video driver
DESCRIPTION:=Kernel modules for CPIA2 WebCam devices
KCONFIG:=CONFIG_VIDEO_CPIA2
AUTOLOAD:=$(call AutoLoad,70,cpia2)
-endef
-
-define KernelPackage/cpia2/2.4
- FILES:=$(LINUX_DIR)/drivers/usb/cpia2.$(LINUX_KMOD_SUFFIX)
-endef
-
-define KernelPackage/cpia2/2.6
FILES:=$(LINUX_DIR)/drivers/media/video/cpia2/cpia2.$(LINUX_KMOD_SUFFIX)
endef
$(eval $(call KernelPackage,cpia2))
@@ -350,18 +343,10 @@ endef
$(eval $(call KernelPackage,usb-net))
define KernelPackage/usb-net-asix
- $(call usbdep,kmod-usb-net)
+ $(call usbdep,kmod-usb-net @LINUX_2_6)
TITLE:=Kernel module for USB-to-Ethernet Asix convertors
DESCRIPTION:=Kernel module for USB-to-Ethernet Asix convertors
KCONFIG:=CONFIG_USB_NET_AX8817X
-endef
-
-define KernelPackage/usb-net-asix/2.4
- FILES:=$(LINUX_DIR)/drivers/usb/ax8817x.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call Autoload,61,ax8817x)
-endef
-
-define KernelPackage/usb-net-asix/2.6
FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call Autoload,61,asix)
endef
@@ -369,7 +354,7 @@ endef
$(eval $(call KernelPackage,usb-net-asix))
define KernelPackage/usb-net-kaweth
- $(call usbdep,kmod-usb-net)
+ $(call usbdep,kmod-usb-net @LINUX_2_6)
TITLE:=Kernel module for USB-to-Ethernet Kaweth convertors
DESCRIPTION:=Kernel module for USB-to-Ethernet Kaweth convertors
KCONFIG:=CONFIG_USB_KAWETH
@@ -380,7 +365,7 @@ endef
$(eval $(call KernelPackage,usb-net-kaweth))
define KernelPackage/usb-net-pegasus
- $(call usbdep,kmod-usb-net)
+ $(call usbdep,kmod-usb-net @LINUX_2_6)
TITLE:=Kernel module for USB-to-Ethernet Pegasus convertors
DESCRIPTION:=Kernel module for USB-to-Ethernet Pegasus convertors
KCONFIG:=CONFIG_USB_PEGASUS
diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index cdd2faf6e1..031077467f 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -17,7 +17,7 @@ define KernelPackage/ieee80211
- ieee80211 \\\
- ieee80211_crypt_wep \\\
- ieee80211_crypt_tkip \\\
- - ieee80211_crytp_ccmp \\\
+ - ieee80211_crytp_ccmp
DEPENDS:=@LINUX_2_6 +kmod-crypto
KCONFIG:=CONFIG_IEEE80211
FILES:= \
@@ -115,6 +115,7 @@ $(eval $(call KernelPackage,net-airo))
define KernelPackage/net-hermes
TITLE:=Hermes 802.11b chipset support
DESCRIPTION:=Kernel support for Hermes 802.11b chipsets
+ DEPENDS:=@LINUX_2_6
KCONFIG:=CONFIG_HERMES
SUBMENU:=$(WIMENU)
FILES:= \
@@ -128,6 +129,7 @@ $(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
+ DEPENDS:=@LINUX_2_6
KCONFIG:=CONFIG_PCI_HERMES
DEPENDS:=kmod-net-hermes
SUBMENU:=$(WIMENU)
@@ -140,6 +142,7 @@ $(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
+ DEPENDS:=@LINUX_2_6
KCONFIG:=CONFIG_PLX_HERMES
DEPENDS:=kmod-net-hermes
SUBMENU:=$(WIMENU)
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 313efe75db..75fda05d44 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -247,9 +247,7 @@ sub target_config_features(@) {
/broken/ and $ret .= "\tdepends BROKEN\n";
/pci/ and $ret .= "\tselect PCI_SUPPORT\n";
/usb/ and $ret .= "\tselect USB_SUPPORT\n";
- /atm/ and $ret .= "\tselect ATM_SUPPORT\n";
/pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";
- /video/ and $ret .= "\tselect VIDEO_SUPPORT\n";
/squashfs/ and $ret .= "\tselect USES_SQUASHFS\n";
/jffs2/ and $ret .= "\tselect USES_JFFS2\n";
/ext2/ and $ret .= "\tselect USES_EXT2\n";
diff --git a/target/Config.in b/target/Config.in
index 627940eb2e..0c8864f3ed 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -17,12 +17,6 @@ config PCMCIA_SUPPORT
config USB_SUPPORT
bool
-config ATM_SUPPORT
- bool
-
-config VIDEO_SUPPORT
- bool
-
config BIG_ENDIAN
bool