From d03a2de5d32ab1af36d7a77ce4b2899e5f871bf0 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 6 Aug 2007 18:48:58 +0000
Subject: More rdc-2.6 fixes by Daniel Gimpelevich, thanks !

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8355 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/rt2x00/Makefile            | 18 +++++++++++++++---
 package/rt2x00/src/Makefile        |  2 +-
 package/rt2x00/src/rt2x00_config.h | 30 ++++--------------------------
 package/rt61/Makefile              |  2 +-
 4 files changed, 21 insertions(+), 31 deletions(-)

(limited to 'package')

diff --git a/package/rt2x00/Makefile b/package/rt2x00/Makefile
index 551289be3..4ab5a1221 100644
--- a/package/rt2x00/Makefile
+++ b/package/rt2x00/Makefile
@@ -9,7 +9,8 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-PKG_NAME:=kmod-rt2x00
+PKG_NAME:=rt2x00
+#PKG_VERSION:=cvs-20070725
 PKG_VERSION:=git-200706018
 
 include $(INCLUDE_DIR)/package.mk
@@ -84,6 +85,11 @@ define KernelPackage/rt61-pci
   AUTOLOAD:=$(call AutoLoad,27,rt61pci)
 endef
 
+define KernelPackage/rt61-pci/install
+	mkdir -p $(1)/lib/firmware
+	$(CP) -L $(PKG_BUILD_DIR)/rt2?61*.bin $(1)/lib/firmware
+endef
+
 define KernelPackage/rt73-usb
   $(call Package/rt2x00/Default)
   DEPENDS:=+kmod-rt2x00-usb
@@ -93,6 +99,11 @@ define KernelPackage/rt73-usb
   AUTOLOAD:=$(call AutoLoad,27,rt73usb)
 endef
 
+define KernelPackage/rt73-usb/install
+	mkdir -p $(1)/lib/firmware
+	$(CP) -L $(PKG_BUILD_DIR)/rt73.bin $(1)/lib/firmware
+endef
+
 define Build/Prepare
 	$(call Build/Prepare/Default)
 	$(CP) -r src/* $(PKG_BUILD_DIR)/
@@ -100,13 +111,14 @@ define Build/Prepare
 endef
 
 define Build/Compile
+#	$(MAKE) -C "$(PKG_BUILD_DIR)" config_header
 	$(MAKE) -C "$(LINUX_DIR)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
+		ARCH="$(LINUX_KARCH)" V="$(V)" \
 		SUBDIRS="$(PKG_BUILD_DIR)" \
 		KERNELVERSION="$(KERNEL)" \
 		KERNEL_SOURCE="$(LINUX_DIR)" \
-		EXTRA_CFLAGS="$(BUILDFLAGS) -include $(PKG_BUILD_DIR)/rt2x00_compat.h" \
+		CFLAGS_MODULE="-DMODULE -include $(PKG_BUILD_DIR)/rt2x00_compat.h" \
 		KDIR="$(LINUX_DIR)"
 endef
 
diff --git a/package/rt2x00/src/Makefile b/package/rt2x00/src/Makefile
index 4f3304f9a..0ed8321e3 100644
--- a/package/rt2x00/src/Makefile
+++ b/package/rt2x00/src/Makefile
@@ -1,4 +1,4 @@
-rt2x00lib-objs := rt2x00dev.o rt2x00mac.o
+rt2x00lib-objs := rt2x00dev.o rt2x00mac.o rt2x00firmware.o
 
 EXTRA_CFLAGS += -DCONFIG_RT2X00_LIB_FIRMWARE
 
diff --git a/package/rt2x00/src/rt2x00_config.h b/package/rt2x00/src/rt2x00_config.h
index 8d6343461..5751dd1f7 100644
--- a/package/rt2x00/src/rt2x00_config.h
+++ b/package/rt2x00/src/rt2x00_config.h
@@ -12,6 +12,10 @@
 
 #undef CONFIG_RT2X00_ASM
 
+#ifndef CONFIG_RT2X00_LIB_FIRMWARE
+#define CONFIG_RT2X00_LIB_FIRMWARE
+#endif
+
 #ifndef CONFIG_RT2400PCI
 #define CONFIG_RT2400PCI
 #endif
@@ -38,29 +42,3 @@
 #define CONFIG_RT73USB
 #endif
 
-#ifndef CONFIG_D80211
-#define CONFIG_D80211
-#endif
-
-#ifndef CONFIG_D80211_DEBUG
-#define CONFIG_D80211_DEBUG
-#endif
-
-#undef CONFIG_D80211_ASM
-
-#ifndef CONFIG_CRC_ITU_T
-#define CONFIG_CRC_ITU_T
-#endif
-
-#undef CONFIG_CRC_ITU_T_ASM
-
-#ifndef CONFIG_EEPROM_93CX6
-#define CONFIG_EEPROM_93CX6
-#endif
-
-#undef CONFIG_EEPROM_93CX6_ASM
-
-#undef CONFIG_RFKILL
-
-#undef CONFIG_RFKILL_ASM
-
diff --git a/package/rt61/Makefile b/package/rt61/Makefile
index 228cd86a2..c0878c397 100644
--- a/package/rt61/Makefile
+++ b/package/rt61/Makefile
@@ -34,7 +34,7 @@ endef
 
 define KernelPackage/rt61/install
 	mkdir -p $(1)/lib/firmware
-	$(CP) -L $(PKG_BUILD_DIR)/Module/rt2*.bin $(1)/lib/firmware
+	$(CP) -L $(PKG_BUILD_DIR)/Module/rt2?61*.bin $(1)/lib/firmware
 endef
 
 LINUX_PATCHLEVEL:=$(shell echo "$(LINUX_VERSION)" | cut -d. -f2)
-- 
cgit v1.2.3