diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-14 00:38:41 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-14 00:38:41 +0100 |
| commit | a03e16ce46353740a2b778beda4dda03c0252e07 (patch) | |
| tree | a13c0f4d285a03a2e5a3ddc42ac718b23bc30a80 /mk | |
| parent | 42675af37cb5ce735452311734cc5b88a66d6d9d (diff) | |
| parent | 58f2ba6405c8b0390995af535592c94eb38e013c (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 4 | ||||
| -rw-r--r-- | mk/modules.mk | 8 | ||||
| -rw-r--r-- | mk/vars.mk | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/mk/build.mk b/mk/build.mk index 5b011a2c5..2c9230397 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -272,7 +272,7 @@ ifneq (,$(filter CYGWIN%,${OStype})) endif @if [ ! -z "$(TARGET)" ];then \ grep "^config" target/Config.in \ - |grep -i "$(TARGET)" \ + |grep -i "$(TARGET)"\$$ \ |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/.defconfig; \ for symbol in ${DEFCONFIG}; do \ @@ -337,7 +337,7 @@ ifneq (,$(filter CYGWIN%,${OStype})) endif @if [ ! -z "$(TARGET)" ];then \ grep "^config" target/Config.in \ - |grep -i "$(TARGET)" \ + |grep -i "$(TARGET)"\$$ \ |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/all.config; \ for symbol in ${DEFCONFIG}; do \ diff --git a/mk/modules.mk b/mk/modules.mk index 9d17ed46c..5ba6ab1e6 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -66,6 +66,14 @@ $(eval $(call KMOD_template,ATH5K,ath5k,\ $(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath5k/ath5k \ ,20, kmod-led-class)) +$(eval $(call KMOD_template,P54_COMMON,p54-common,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/p54/p54common \ +,68)) + +$(eval $(call KMOD_template,P54_USB,p54-usb,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/p54/p54usb \ +,70)) + $(eval $(call KMOD_template,RT2X00,rt2x00,\ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00lib \ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00pci \ diff --git a/mk/vars.mk b/mk/vars.mk index 3180ed949..3a6591925 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -112,6 +112,8 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \ bzip2 -dc $$file | tar -xf - ;; \ *.zip) \ unzip -qd ${WRKDIR} $$file ;; \ + *.arm) \ + cp $$file ${WRKDIR} ;; \ *) \ echo "Cannot extract '$$file'" >&2; \ false ;; \ |