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>

diff --git a/patches/collateral-evolutions/network/72-brcm80211-makefiles/INFO b/patches/collateral-evolutions/network/72-brcm80211-makefiles/INFO
new file mode 100644 (file)
index 0000000..bdd5316
--- /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 (file)
index 0000000..67ffd59
--- /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 (file)
index 0000000..8b4da95
--- /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