fixes zd1211rw compile and cleans up mac80211 Makefile

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11787 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2008-07-12 15:04:36 +00:00
parent deb7bf1261
commit 04edd2b07e
2 changed files with 8 additions and 45 deletions

View File

@ -198,18 +198,3 @@ endef
$(eval $(call KernelPackage,net-prism54)) $(eval $(call KernelPackage,net-prism54))
define KernelPackage/net-zd1211rw
SUBMENU:=$(WIRELESS_MENU)
TITLE:=Zydas ZD1211 support
DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-ieee80211-softmac
KCONFIG:=CONFIG_ZD1211RW
FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,60,zd1211rw)
endef
define KernelPackage/net-zd1211rw/description
Kernel modules for Zydas ZD1211 support, kernel version
endef
$(eval $(call KernelPackage,net-zd1211rw))

View File

@ -122,35 +122,13 @@ define KernelPackage/rt73-usb
AUTOLOAD:=$(call AutoLoad,27,rt73usb) AUTOLOAD:=$(call AutoLoad,27,rt73usb)
endef endef
RT2X00_CONFOPTS:=CONFIG_RT2X00=y \ define KernelPackage/net-zd1211rw
CONFIG_RT2X00_DEBUG=y \ SUBMENU:=Wireless Drivers
CONFIG_RT2X00_LIB_FIRMWARE=y \ TITLE:=Zydas ZD1211 support
CONFIG_RT2X00_LIB_LEDS=y DEPENDS:=@LINUX_2_6_24||LINUX_2_6_25 @USB_SUPPORT +kmod-ieee80211-softmac
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX)
ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-pci),) AUTOLOAD:=$(call AutoLoad,60,zd1211rw)
RT2X00_CONFOPTS+= CONFIG_RT2X00_LIB_PCI=y endef
endif
ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-usb),)
RT2X00_CONFOPTS+= CONFIG_RT2X00_LIB_USB=y
endif
ifneq ($(CONFIG_PACKAGE_kmod-rt2400-pci),)
RT2X00_CONFOPTS+= CONFIG_RT2400PCI=y
endif
ifneq ($(CONFIG_PACKAGE_kmod-rt2500-pci),)
RT2X00_CONFOPTS+= CONFIG_RT2500PCI=y
endif
ifneq ($(CONFIG_PACKAGE_kmod-rt2500-usb),)
RT2X00_CONFOPTS+= CONFIG_RT2500USB=y
endif
ifneq ($(CONFIG_PACKAGE_kmod-rt61-pci),)
RT2X00_CONFOPTS+= CONFIG_RT61PCI=y
endif
ifneq ($(CONFIG_PACKAGE_kmod-rt73-usb),)
RT2X00_CONFOPTS+= CONFIG_RT73USB=y
endif
CONFOPTS:=MAC80211 CFG80211 NL80211 MAC80211_RC_DEFAULT_PID MAC80211_RC_PID \
BUILDFLAGS:= \ BUILDFLAGS:= \
$(foreach opt,$(CONFOPTS),-DCONFIG_$(opt)) \ $(foreach opt,$(CONFOPTS),-DCONFIG_$(opt)) \
@ -209,7 +187,7 @@ define KernelPackage/rt73-usb/install
$(INSTALL_DATA) $(PKG_BUILD_DIR)/rt73.bin $(1)/lib/firmware/ $(INSTALL_DATA) $(PKG_BUILD_DIR)/rt73.bin $(1)/lib/firmware/
endef endef
$(eval $(call KernelPackage,net-zd1211rw))
$(eval $(call KernelPackage,mac80211)) $(eval $(call KernelPackage,mac80211))
$(eval $(call KernelPackage,rt2x00-lib)) $(eval $(call KernelPackage,rt2x00-lib))
$(eval $(call KernelPackage,rt2x00-pci)) $(eval $(call KernelPackage,rt2x00-pci))