qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 18:35:55 +02:00
Code

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)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11272 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2008-05-26 22:57:51 +00:00
parent 36d99dbbd5
commit eda158fc7b
10 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/acx-mac80211/Makefile
View File

@ -27,11 +27,10 @@ PKG_FW_C19_MD5SUM:=a1fa9681e297b4e36e257090fc12265a
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
# XXX: remove @!TARGET_* later when we have PCI support properly detected on all targets
define KernelPackage/acx-mac80211 define KernelPackage/acx-mac80211
SUBMENU:=Wireless Drivers SUBMENU:=Wireless Drivers
TITLE:=ACX111 Mac80211 driver 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) FILES:=$(PKG_BUILD_DIR)/acx-mac80211.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,acx-mac80211) AUTOLOAD:=$(call AutoLoad,50,acx-mac80211)
endef endef

5
package/acx/Makefile
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -32,10 +32,9 @@ PKG_UNPACK:= \
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
# XXX: remove @!TARGET_* later when we have PCI support properly detected on all targets
define KernelPackage/acx define KernelPackage/acx
TITLE:=Driver for TI ACX1xx chipset 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/ URL:=http://acx100.sourceforge.net/
SUBMENU:=Wireless Drivers SUBMENU:=Wireless Drivers
FILES:= $(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX) FILES:= $(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX)

6
package/kernel/modules/other.mk
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -154,11 +154,10 @@ endef
$(eval $(call KernelPackage,pcmcia-serial)) $(eval $(call KernelPackage,pcmcia-serial))
# XXX: remove @!TARGET_* later when we have USB support properly detected on all targets
define KernelPackage/bluetooth define KernelPackage/bluetooth
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=Bluetooth support TITLE:=Bluetooth support
DEPENDS:=@USB_SUPPORT @!TARGET_uml DEPENDS:=@USB_SUPPORT
KCONFIG:= \ KCONFIG:= \
CONFIG_BLUEZ \ CONFIG_BLUEZ \
CONFIG_BLUEZ_L2CAP \ CONFIG_BLUEZ_L2CAP \
@ -306,7 +305,6 @@ endef
$(eval $(call KernelPackage,softdog)) $(eval $(call KernelPackage,softdog))
# XXX: remove @TARGET_* later when we are able to detect the exact version of the kernel
define KernelPackage/leds-gpio define KernelPackage/leds-gpio
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=GPIO LED support TITLE:=GPIO LED support

5
package/kernel/modules/sound.mk
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,11 +8,10 @@
SOUND_MENU:=Sound Support SOUND_MENU:=Sound Support
# XXX: remove @!TARGET_* later when we have PCI & USB support properly detected on all targets
define KernelPackage/sound-core define KernelPackage/sound-core
SUBMENU:=$(SOUND_MENU) SUBMENU:=$(SOUND_MENU)
TITLE:=Sound support TITLE:=Sound support
DEPENDS:=@USB_SUPPORT||PCI_SUPPORT DEPENDS:=@PCI_SUPPORT||USB_SUPPORT
KCONFIG:= \ KCONFIG:= \
CONFIG_SOUND \ CONFIG_SOUND \
CONFIG_SND \ CONFIG_SND \

4
package/kernel/modules/video.mk
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -11,7 +11,7 @@ VIDEO_MENU:=Video Support
define KernelPackage/video-core define KernelPackage/video-core
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE=Video4Linux support TITLE=Video4Linux support
DEPENDS:= @!TARGET_uml DEPENDS:=@PCI_SUPPORT||USB_SUPPORT
KCONFIG:= \ KCONFIG:= \
CONFIG_VIDEO_DEV \ CONFIG_VIDEO_DEV \
CONFIG_VIDEO_V4L1=y \ CONFIG_VIDEO_V4L1=y \

6
package/mac80211/Makefile
View File

@ -19,12 +19,10 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
# XXX: remove @!TARGET_* later when we have PCI & USB support properly detected on all targets
define KernelPackage/mac80211 define KernelPackage/mac80211
SUBMENU:=Wireless Drivers SUBMENU:=Wireless Drivers
TITLE:=Linux 802.11 Wireless Networking Stack 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:= \ FILES:= \
$(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
$(PKG_BUILD_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX) $(PKG_BUILD_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX)
@ -56,7 +54,7 @@ $(eval $(call Download,rt71w))
define KernelPackage/rt2x00/Default define KernelPackage/rt2x00/Default
SUBMENU:=Wireless Drivers SUBMENU:=Wireless Drivers
TITLE:=Ralink Drivers for RT2x00 cards 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 endef
define KernelPackage/rt2x00-lib define KernelPackage/rt2x00-lib

5
package/nw802-2.4/Makefile
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -19,12 +19,11 @@ PKG_MD5SUM:=bf3512efaa48cfa972b16318011c1963
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
# XXX: remove @!TARGET_* later when we have USB support properly detected on all targets
define KernelPackage/video-nw8xx define KernelPackage/video-nw8xx
SUBMENU:=Video Support SUBMENU:=Video Support
TITLE:=NW8xx based USB webcam support TITLE:=NW8xx based USB webcam support
URL:=http://nw802.sourceforge.net/ 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) FILES:=$(PKG_BUILD_DIR)/nw8xx.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,70,nw8xx) AUTOLOAD:=$(call AutoLoad,70,nw8xx)
endef endef

3
package/ov51x-jpeg/Makefile
View File

@ -36,12 +36,11 @@ define Package/ov51x-jpeg-utils/description
Utility programs for the video-ov51x kernel module Utility programs for the video-ov51x kernel module
endef endef
# XXX: remove @!TARGET_* later when we have USB support properly detected on all targets
define KernelPackage/video-ov51x-jpeg define KernelPackage/video-ov51x-jpeg
$(call Package/ov51x-jpeg/Default) $(call Package/ov51x-jpeg/Default)
SUBMENU:=Video Support SUBMENU:=Video Support
TITLE:=OV51x based USB webcam support (JPEG) 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) FILES:=$(PKG_BUILD_DIR)/ov51x-jpeg.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,70,ov51x-jpeg) AUTOLOAD:=$(call AutoLoad,70,ov51x-jpeg)
endef endef

4
package/p54/Makefile
View File

@ -18,12 +18,10 @@ PKG_FWP54_MD5SUM:=09f9da7ea757173c9de1a0322a1f9782
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
# XXX: remove @!TARGET_* later when we have PCI & USB support properly detected on all targets
define KernelPackage/p54/Default define KernelPackage/p54/Default
SUBMENU:=Wireless Drivers SUBMENU:=Wireless Drivers
TITLE:=Prism Wireless Support (mac80211) TITLE:=Prism Wireless Support (mac80211)
DEPENDS:=+kmod-mac80211 @!TARGET_ar7 @!TARGET_atheros @!TARGET_uml DEPENDS:=+kmod-mac80211 @BROKEN
endef endef
define KernelPackage/p54-common define KernelPackage/p54-common

2
package/rt2500/Makefile
View File

@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
define KernelPackage/rt2500 define KernelPackage/rt2500
SUBMENU:=Wireless Drivers SUBMENU:=Wireless Drivers
TITLE:=Driver for Ralink RT2500 pci wireless chipsets 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/ URL:=http://rt2x00.serialmonkey.com/
FILES:=$(PKG_BUILD_DIR)/Module/rt2500.$(LINUX_KMOD_SUFFIX) FILES:=$(PKG_BUILD_DIR)/Module/rt2500.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,rt2500) AUTOLOAD:=$(call AutoLoad,50,rt2500)