From eda158fc7b8192a1bead181561169ff245c0e04c Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 26 May 2008 22:57:51 +0000 Subject: [PATCH] remove hacks to disable modules on some targets now that we do have proper PCI & USB support detected on all targets at config-time, mark p54 as broken (for too long) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11272 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/acx-mac80211/Makefile | 3 +-- package/acx/Makefile | 5 ++--- package/kernel/modules/other.mk | 6 ++---- package/kernel/modules/sound.mk | 5 ++--- package/kernel/modules/video.mk | 4 ++-- package/mac80211/Makefile | 6 ++---- package/nw802-2.4/Makefile | 5 ++--- package/ov51x-jpeg/Makefile | 3 +-- package/p54/Makefile | 4 +--- package/rt2500/Makefile | 2 +- 10 files changed, 16 insertions(+), 27 deletions(-) diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile index 4c96cdf4a..d2b6d8adb 100644 --- a/package/acx-mac80211/Makefile +++ b/package/acx-mac80211/Makefile @@ -27,11 +27,10 @@ PKG_FW_C19_MD5SUM:=a1fa9681e297b4e36e257090fc12265a include $(INCLUDE_DIR)/package.mk -# XXX: remove @!TARGET_* later when we have PCI support properly detected on all targets define KernelPackage/acx-mac80211 SUBMENU:=Wireless Drivers TITLE:=ACX111 Mac80211 driver - DEPENDS:=+kmod-mac80211 @!TARGET_atheros @!TARGET_uml @BROKEN + DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||TARGET_ar7 +kmod-mac80211 @BROKEN FILES:=$(PKG_BUILD_DIR)/acx-mac80211.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,acx-mac80211) endef diff --git a/package/acx/Makefile b/package/acx/Makefile index 107a54f8f..c1dbe3530 100644 --- a/package/acx/Makefile +++ b/package/acx/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -32,10 +32,9 @@ PKG_UNPACK:= \ include $(INCLUDE_DIR)/package.mk -# XXX: remove @!TARGET_* later when we have PCI support properly detected on all targets define KernelPackage/acx TITLE:=Driver for TI ACX1xx chipset - DEPENDS:=@LINUX_2_6 +wireless-tools @!TARGET_atheros @!TARGET_avr32 @!TARGET_uml + DEPENDS:=@LINUX_2_6 @CONFIG_PCI||TARGET_ar7 +wireless-tools URL:=http://acx100.sourceforge.net/ SUBMENU:=Wireless Drivers FILES:= $(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX) diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index d7d078d37..a096552bd 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -154,11 +154,10 @@ endef $(eval $(call KernelPackage,pcmcia-serial)) -# XXX: remove @!TARGET_* later when we have USB support properly detected on all targets define KernelPackage/bluetooth SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth support - DEPENDS:=@USB_SUPPORT @!TARGET_uml + DEPENDS:=@USB_SUPPORT KCONFIG:= \ CONFIG_BLUEZ \ CONFIG_BLUEZ_L2CAP \ @@ -306,7 +305,6 @@ endef $(eval $(call KernelPackage,softdog)) -# XXX: remove @TARGET_* later when we are able to detect the exact version of the kernel define KernelPackage/leds-gpio SUBMENU:=$(OTHER_MENU) TITLE:=GPIO LED support diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk index a69780701..547fddc83 100644 --- a/package/kernel/modules/sound.mk +++ b/package/kernel/modules/sound.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,10 @@ SOUND_MENU:=Sound Support -# XXX: remove @!TARGET_* later when we have PCI & USB support properly detected on all targets define KernelPackage/sound-core SUBMENU:=$(SOUND_MENU) TITLE:=Sound support - DEPENDS:=@USB_SUPPORT||PCI_SUPPORT + DEPENDS:=@PCI_SUPPORT||USB_SUPPORT KCONFIG:= \ CONFIG_SOUND \ CONFIG_SND \ diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk index bd950e343..da19de657 100644 --- a/package/kernel/modules/video.mk +++ b/package/kernel/modules/video.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -11,7 +11,7 @@ VIDEO_MENU:=Video Support define KernelPackage/video-core SUBMENU:=$(VIDEO_MENU) TITLE=Video4Linux support - DEPENDS:= @!TARGET_uml + DEPENDS:=@PCI_SUPPORT||USB_SUPPORT KCONFIG:= \ CONFIG_VIDEO_DEV \ CONFIG_VIDEO_V4L1=y \ diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index cd4f93654..bbcba63fc 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -19,12 +19,10 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk -# XXX: remove @!TARGET_* later when we have PCI & USB support properly detected on all targets - define KernelPackage/mac80211 SUBMENU:=Wireless Drivers TITLE:=Linux 802.11 Wireless Networking Stack - DEPENDS:=@LINUX_2_6_23||LINUX_2_6_24 +kmod-crypto-arc4 +kmod-crypto-aes +wireless-tools + DEPENDS:=@LINUX_2_6_23||LINUX_2_6_24||LINUX_2_6_25 +kmod-crypto-arc4 +kmod-crypto-aes +wireless-tools FILES:= \ $(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX) @@ -56,7 +54,7 @@ $(eval $(call Download,rt71w)) define KernelPackage/rt2x00/Default SUBMENU:=Wireless Drivers TITLE:=Ralink Drivers for RT2x00 cards - DEPENDS:=@LINUX_2_6_24 @!TARGET_ar7 @!TARGET_atheros @!TARGET_uml + DEPENDS:=@LINUX_2_6_24||LINUX_2_6_25 endef define KernelPackage/rt2x00-lib diff --git a/package/nw802-2.4/Makefile b/package/nw802-2.4/Makefile index f9c2ad4ef..ff39ad772 100644 --- a/package/nw802-2.4/Makefile +++ b/package/nw802-2.4/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -19,12 +19,11 @@ PKG_MD5SUM:=bf3512efaa48cfa972b16318011c1963 include $(INCLUDE_DIR)/package.mk -# XXX: remove @!TARGET_* later when we have USB support properly detected on all targets define KernelPackage/video-nw8xx SUBMENU:=Video Support TITLE:=NW8xx based USB webcam support URL:=http://nw802.sourceforge.net/ - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-video kmod-video-core @!TARGET_atheros @!TARGET_uml + DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-video kmod-video-core FILES:=$(PKG_BUILD_DIR)/nw8xx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,nw8xx) endef diff --git a/package/ov51x-jpeg/Makefile b/package/ov51x-jpeg/Makefile index 4ef1bd281..7bd06d9d6 100644 --- a/package/ov51x-jpeg/Makefile +++ b/package/ov51x-jpeg/Makefile @@ -36,12 +36,11 @@ define Package/ov51x-jpeg-utils/description Utility programs for the video-ov51x kernel module endef -# XXX: remove @!TARGET_* later when we have USB support properly detected on all targets define KernelPackage/video-ov51x-jpeg $(call Package/ov51x-jpeg/Default) SUBMENU:=Video Support TITLE:=OV51x based USB webcam support (JPEG) - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core kmod-video-core @!TARGET_atheros @!TARGET_uml + DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core kmod-video-core FILES:=$(PKG_BUILD_DIR)/ov51x-jpeg.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,ov51x-jpeg) endef diff --git a/package/p54/Makefile b/package/p54/Makefile index df2e40433..65e8f232f 100644 --- a/package/p54/Makefile +++ b/package/p54/Makefile @@ -18,12 +18,10 @@ PKG_FWP54_MD5SUM:=09f9da7ea757173c9de1a0322a1f9782 include $(INCLUDE_DIR)/package.mk -# XXX: remove @!TARGET_* later when we have PCI & USB support properly detected on all targets - define KernelPackage/p54/Default SUBMENU:=Wireless Drivers TITLE:=Prism Wireless Support (mac80211) - DEPENDS:=+kmod-mac80211 @!TARGET_ar7 @!TARGET_atheros @!TARGET_uml + DEPENDS:=+kmod-mac80211 @BROKEN endef define KernelPackage/p54-common diff --git a/package/rt2500/Makefile b/package/rt2500/Makefile index 76d92ca17..0b3e0136a 100644 --- a/package/rt2500/Makefile +++ b/package/rt2500/Makefile @@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/rt2500 SUBMENU:=Wireless Drivers TITLE:=Driver for Ralink RT2500 pci wireless chipsets - DEPENDS:=@!LINUX_2_6_24 @!BIG_ENDIAN @USB_SUPPORT +wireless-tools + DEPENDS:=@!LINUX_2_6_24&&!LINUX_2_6_25 @!BIG_ENDIAN @USB_SUPPORT +wireless-tools URL:=http://rt2x00.serialmonkey.com/ FILES:=$(PKG_BUILD_DIR)/Module/rt2500.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,rt2500)