projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cf187a1
)
change madwifi makefile so that it can build both ahb and pci versions in one pass
author
Felix Fietkau
<nbd@openwrt.org>
Mon, 30 Jan 2006 01:59:33 +0000
(
01:59
+0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Mon, 30 Jan 2006 01:59:33 +0000
(
01:59
+0000)
SVN-Revision: 3070
openwrt/target/linux/package/madwifi/Makefile
patch
|
blob
|
history
diff --git
a/openwrt/target/linux/package/madwifi/Makefile
b/openwrt/target/linux/package/madwifi/Makefile
index d0aabbe93433a9ecc29730b5e6441c700a1cd72f..da94415408db56f1ef828ff2bc714e43415819cb 100644
(file)
--- a/
openwrt/target/linux/package/madwifi/Makefile
+++ b/
openwrt/target/linux/package/madwifi/Makefile
@@
-24,13
+24,23
@@
ifeq ($(ARCH),i386)
HAL_TARGET:=i386-elf
endif
HAL_TARGET:=i386-elf
endif
+BUS := PCI
+
ifneq ($(BR2_LINUX_2_4_AR531X),)
BUS := AHB
ifneq ($(BR2_LINUX_2_4_AR531X),)
BUS := AHB
- bus := ahb
-else
- BUS := PCI
- bus := pci
endif
endif
+# ifneq ($(BR2_LINUX_2_6_ARUBA),)
+# BUS := PCI AHB # no suitable HAL for AHB yet.
+# 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)
+endif
+
include $(TOPDIR)/package/rules.mk
include $(TOPDIR)/package/rules.mk
@@
-39,8
+49,7
@@
$(eval $(call PKG_template,KMOD_MADWIFI,kmod-madwifi,$(LINUX_VERSION)+$(PKG_VERS
$(PKG_BUILD_DIR)/.configured:
touch $@
$(PKG_BUILD_DIR)/.configured:
touch $@
-$(PKG_BUILD_DIR)/.built:
- $(MAKE) -C $(PKG_BUILD_DIR) \
+MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \
PATH="$(TARGET_PATH)" \
ARCH="$(LINUX_KARCH)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
PATH="$(TARGET_PATH)" \
ARCH="$(LINUX_KARCH)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
@@
-48,8
+57,16
@@
$(PKG_BUILD_DIR)/.built:
TOOLPREFIX="$(KERNEL_CROSS)" \
TOOLPATH="$(KERNEL_CROSS)" \
KERNELPATH="$(LINUX_DIR)" \
TOOLPREFIX="$(KERNEL_CROSS)" \
TOOLPATH="$(KERNEL_CROSS)" \
KERNELPATH="$(LINUX_DIR)" \
- BUS="$(BUS)" \
- DOMULTI=1 all
+ DOMULTI=1
+
+
+$(PKG_BUILD_DIR)/.built:
+ifeq ($(findstring AHB,$(BUS)),AHB)
+ $(MAKE) $(MADWIFI_MAKEOPTS) BUS="AHB" all
+endif
+ifeq ($(findstring PCI,$(BUS)),PCI)
+ $(MAKE) $(MADWIFI_MAKEOPTS) BUS="PCI" all
+endif
$(RSTRIP) $(PKG_BUILD_DIR)/tools/madwifi_multi
touch $@
$(RSTRIP) $(PKG_BUILD_DIR)/tools/madwifi_multi
touch $@
@@
-62,7
+79,7
@@
$(IPKG_KMOD_MADWIFI):
install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI)/etc/init.d/S20madwifi
cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \
$(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI)/etc/init.d/S20madwifi
cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \
$(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
- $(
PKG_BUILD_DIR)/ath/ath_$(bus).$(LINUX_KMOD_SUFFIX
) \
+ $(
BUS_MODULES
) \
$(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \
$(PKG_BUILD_DIR)/net80211/*.$(LINUX_KMOD_SUFFIX) \
$(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/
$(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \
$(PKG_BUILD_DIR)/net80211/*.$(LINUX_KMOD_SUFFIX) \
$(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/