summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/72-brcm80211-makefiles
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2013-04-01 19:46:36 +0200
committerJohannes Berg <johannes@sipsolutions.net>2013-04-01 21:03:45 +0200
commit805c89b8a31f336c6e81482a85cfaabdc7342713 (patch)
treeaa7957b43487e4b22e19d6b7910a4594679c9d9f /patches/collateral-evolutions/network/72-brcm80211-makefiles
parentbfd716a98722746860ad5f1b3515917200e03e05 (diff)
add brcm80211 makefile patch
The simple parser doesn't understand the variable indirection (yet) and right now it's simpler and faster to patch the makefiles rather than improve the parser. Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Diffstat (limited to 'patches/collateral-evolutions/network/72-brcm80211-makefiles')
-rw-r--r--patches/collateral-evolutions/network/72-brcm80211-makefiles/INFO3
-rw-r--r--patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmsmac.patch25
-rw-r--r--patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmutil.patch15
3 files changed, 43 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/network/72-brcm80211-makefiles/INFO b/patches/collateral-evolutions/network/72-brcm80211-makefiles/INFO
new file mode 100644
index 00000000..bdd53164
--- /dev/null
+++ b/patches/collateral-evolutions/network/72-brcm80211-makefiles/INFO
@@ -0,0 +1,3 @@
+Modify the brcm80211 Makefiles to allow our simple
+Makefile parser to understand them and not disable
+brcm80211 due to the weird variable indirection.
diff --git a/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmsmac.patch b/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmsmac.patch
new file mode 100644
index 00000000..67ffd599
--- /dev/null
+++ b/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmsmac.patch
@@ -0,0 +1,25 @@
+--- a/drivers/net/wireless/brcm80211/brcmsmac/Makefile
++++ b/drivers/net/wireless/brcm80211/brcmsmac/Makefile
+@@ -21,7 +21,7 @@
+ -I$(obj)/phy \
+ -I$(obj)/../include
+
+-BRCMSMAC_OFILES := \
++brcmsmac-y := \
+ mac80211_if.o \
+ ucode_loader.o \
+ ampdu.o \
+@@ -43,11 +43,6 @@
+ brcms_trace_events.o \
+ debug.o
+
+-ifdef CONFIG_BCMA_DRIVER_GPIO
+-BRCMSMAC_OFILES += led.o
+-endif
++brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o
+
+-MODULEPFX := brcmsmac
+-
+-obj-$(CONFIG_BRCMSMAC) += $(MODULEPFX).o
+-$(MODULEPFX)-objs = $(BRCMSMAC_OFILES)
++obj-$(CONFIG_BRCMSMAC) += brcmsmac.o
diff --git a/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmutil.patch b/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmutil.patch
new file mode 100644
index 00000000..8b4da952
--- /dev/null
+++ b/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmutil.patch
@@ -0,0 +1,15 @@
+--- a/drivers/net/wireless/brcm80211/brcmutil/Makefile
++++ b/drivers/net/wireless/brcm80211/brcmutil/Makefile
+@@ -19,10 +19,5 @@
+ -I$(obj) \
+ -I$(obj)/../include
+
+-BRCMUTIL_OFILES := \
+- utils.o
+-
+-MODULEPFX := brcmutil
+-
+-obj-$(CONFIG_BRCMUTIL) += $(MODULEPFX).o
+-$(MODULEPFX)-objs = $(BRCMUTIL_OFILES)
++obj-$(CONFIG_BRCMUTIL) += brcmutil.o
++brcmutil-objs = utils.o