Fix build on non-SMP machines of the remote GDB debugging (#2666)

[openwrt.git] / package / madwifi / Makefile

diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 7de2bd3..952da7e 100644 (file)
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -10,19 +10,18 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=madwifi
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=madwifi

-PKG_VERSION:=r2568-20070710
+PKG_VERSION:=r2834-20071106

 PKG_BRANCH:=madwifi-ng
 PKG_BRANCH:=madwifi-ng

-PKG_RELEASE:=2
+PKG_RELEASE:=1

 
 PKG_SOURCE:=$(PKG_BRANCH)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://snapshots.madwifi.org/$(PKG_BRANCH)
 
 PKG_SOURCE:=$(PKG_BRANCH)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://snapshots.madwifi.org/$(PKG_BRANCH)

+PKG_MD5SUM:=3de6b07146001b53bc45de5d3dd95bc2
+

 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BRANCH)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BRANCH)-$(PKG_VERSION)

-PKG_MD5SUM:=fe5d41acd085d2c46934be3f8839e694

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

-RATE_CONTROL:=minstrel
-

 ifeq ($(ARCH),mips)
   HAL_TARGET:=mips-be-elf
 endif
 ifeq ($(ARCH),mips)
   HAL_TARGET:=mips-be-elf
 endif


@@ -32,6 +31,9 @@ endif
 ifeq ($(ARCH),i386)
   HAL_TARGET:=i386-elf
 endif
 ifeq ($(ARCH),i386)
   HAL_TARGET:=i386-elf
 endif

+ifeq ($(ARCH),i686)
+  HAL_TARGET:=i386-elf
+endif

 ifeq ($(ARCH),armeb)
   HAL_TARGET:=xscale-be-elf
 endif
 ifeq ($(ARCH),armeb)
   HAL_TARGET:=xscale-be-elf
 endif


@@ -42,20 +44,34 @@ ifeq ($(ARCH),powerpc)
   HAL_TARGET:=powerpc-be-elf
 endif
 
   HAL_TARGET:=powerpc-be-elf
 endif
 

-BUS:=PCI
-ifneq ($(CONFIG_TARGET_ATHEROS),)
+ifneq ($(CONFIG_TARGET_atheros),)

   BUS:=AHB
   HAL_TARGET:=ap51
   BUS:=AHB
   HAL_TARGET:=ap51

+else
+  ifneq ($(CONFIG_PCI_SUPPORT),)
+    BUS:=PCI
+  endif

 endif
 
 endif
 

-BUS_MODULES:=
-ifeq ($(findstring AHB,$(BUS)),AHB)
-  BUS_MODULES+=$(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX)
-endif
-ifeq ($(findstring PCI,$(BUS)),PCI)
-  BUS_MODULES+=$(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX)
+# XXX: remove this check later when we have PCI support properly detected on all targets
+ifneq ($(CONFIG_TARGET_uml),)
+ BUS:=

 endif
 
 endif
 

+RATE_CONTROL:=minstrel
+
+MADWIFI_FILES:= \
+       $(PKG_BUILD_DIR)/net80211/wlan.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/net80211/wlan_scan_ap.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/net80211/wlan_scan_sta.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/ath_rate/$(RATE_CONTROL)/ath_rate_$(RATE_CONTROL).$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/net80211/wlan_acl.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/net80211/wlan_ccmp.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/net80211/wlan_tkip.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/net80211/wlan_wep.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/net80211/wlan_xauth.$(LINUX_KMOD_SUFFIX) \
+

 MADWIFI_AUTOLOAD:= \
        wlan \
        wlan_scan_ap \
 MADWIFI_AUTOLOAD:= \
        wlan \
        wlan_scan_ap \


@@ -66,25 +82,23 @@ MADWIFI_AUTOLOAD:= \
        wlan_ccmp \
        wlan_tkip \
        wlan_wep \
        wlan_ccmp \
        wlan_tkip \
        wlan_wep \

-       wlan_xauth
+       wlan_xauth \

 
 ifeq ($(findstring AHB,$(BUS)),AHB)
 
 ifeq ($(findstring AHB,$(BUS)),AHB)

-       MADWIFI_AUTOLOAD += ath_ahb
+       MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX)
+       MADWIFI_AUTOLOAD+= ath_ahb

 endif
 ifeq ($(findstring PCI,$(BUS)),PCI)
 endif
 ifeq ($(findstring PCI,$(BUS)),PCI)

-       MADWIFI_AUTOLOAD += ath_pci
+       MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX)
+       MADWIFI_AUTOLOAD+= ath_pci

 endif
 
 define KernelPackage/madwifi
   SUBMENU:=Wireless Drivers
   TITLE:=Driver for Atheros wireless chipsets
 endif
 
 define KernelPackage/madwifi
   SUBMENU:=Wireless Drivers
   TITLE:=Driver for Atheros wireless chipsets

-  DEPENDS:=+wireless-tools @!LINUX_2_6_AVR32 @!LINUX_2_6_ETRAX

   URL:=http://madwifi.org/
   URL:=http://madwifi.org/

-  FILES:= \
-               $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
-               $(BUS_MODULES) \
-               $(PKG_BUILD_DIR)/ath_rate/$(RATE_CONTROL)/ath_rate_$(RATE_CONTROL).$(LINUX_KMOD_SUFFIX) \
-               $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:=+wireless-tools @PCI_SUPPORT||TARGET_atheros @!TARGET_avr32 @!TARGET_etrax @!TARGET_uml
+  FILES:=$(MADWIFI_FILES)

   AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD))
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD))
 endef
 


@@ -92,28 +106,33 @@ define KernelPackage/madwifi/description
  This package contains a driver for Atheros 802.11a/b/g chipsets.
 endef
 
  This package contains a driver for Atheros 802.11a/b/g chipsets.
 endef
 

-MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \
-               PATH="$(TARGET_PATH)" \
-               ARCH="$(LINUX_KARCH)" \
-               CROSS_COMPILE="$(TARGET_CROSS)" \
-               TARGET="$(HAL_TARGET)" \
-               TOOLPREFIX="$(KERNEL_CROSS)" \
-               TOOLPATH="$(KERNEL_CROSS)" \
-               KERNELPATH="$(LINUX_DIR)" \
-               LDOPTS="--no-warn-mismatch " \
-               ATH_RATE="ath_rate/$(RATE_CONTROL)" \
-               WARNINGS="" \
-               DOMULTI=1
+MAKE_ARGS:= \
+       PATH="$(TARGET_PATH)" \
+       ARCH="$(LINUX_KARCH)" \
+       CROSS_COMPILE="$(TARGET_CROSS)" \
+       TARGET="$(HAL_TARGET)" \
+       TOOLPREFIX="$(KERNEL_CROSS)" \
+       TOOLPATH="$(KERNEL_CROSS)" \
+       KERNELPATH="$(LINUX_DIR)" \
+       LDOPTS="--no-warn-mismatch " \
+       ATH_RATE="ath_rate/$(RATE_CONTROL)" \
+       WARNINGS="" \
+       DOMULTI=1
+
+MAKE_VARS:= \
+       COPTS="-DCONFIG_ATHEROS_RATE_DEFAULT='\"$(RATE_CONTROL)\"'" \

 
 ifeq ($(findstring AHB,$(BUS)),AHB)
   define Build/Compile/ahb
 
 ifeq ($(findstring AHB,$(BUS)),AHB)
   define Build/Compile/ahb

-       COPTS="-DCONFIG_ATHEROS_RATE_DEFAULT='\"$(RATE_CONTROL)\"'" $(MAKE) $(MADWIFI_MAKEOPTS) BUS="AHB" modules
+       $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) BUS="AHB" modules
+       $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) CFLAGS="$(TARGET_CFLAGS)" tools

   endef
 endif
 
 ifeq ($(findstring PCI,$(BUS)),PCI)
   define Build/Compile/pci
   endef
 endif
 
 ifeq ($(findstring PCI,$(BUS)),PCI)
   define Build/Compile/pci

-       COPTS="-DCONFIG_ATHEROS_RATE_DEFAULT='\"$(RATE_CONTROL)\"'" $(MAKE) $(MADWIFI_MAKEOPTS) BUS="PCI" modules
+       $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) BUS="PCI" modules
+       $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) CFLAGS="$(TARGET_CFLAGS)" tools

   endef
 endif
 
   endef
 endif
 


@@ -124,20 +143,17 @@ endef
 define Build/Compile
        $(call Build/Compile/ahb)
        $(call Build/Compile/pci)
 define Build/Compile
        $(call Build/Compile/ahb)
        $(call Build/Compile/pci)

-       $(MAKE) $(MADWIFI_MAKEOPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               tools

 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       mkdir -p $(STAGING_DIR)/usr/include/madwifi
-       $(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi/
-       mkdir -p $(STAGING_DIR)/usr/include/madwifi/net80211
-       $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/
+       mkdir -p $(1)/usr/include/madwifi
+       $(CP) $(PKG_BUILD_DIR)/include $(1)/usr/include/madwifi/
+       mkdir -p $(1)/usr/include/madwifi/net80211
+       $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(1)/usr/include/madwifi/net80211/

 endef
 
 define Build/UninstallDev
 endef
 
 define Build/UninstallDev

-       rm -rf  $(STAGING_DIR)/usr/include/madwifi
+       rm -rf $(1)/usr/include/madwifi

 endef
 
 define KernelPackage/madwifi/install
 endef
 
 define KernelPackage/madwifi/install