Merge branch qcom-LW.BR.4.0.3-05400 into android-msm-common-4.9
Bug: 155037016
Change-Id: I7a6037d8c1319197493e6f30e68682f088654b36
diff --git a/Kbuild b/Kbuild
index d822f0f..9ecf659 100644
--- a/Kbuild
+++ b/Kbuild
@@ -710,7 +710,10 @@
CDEFINES += -DWDI_RE_ENABLE_WIFI_ON_WDI_TIMEOUT
endif
-ifeq ($(KERNEL_BUILD),1)
+# Make WLAN as open-source driver by default
+WLAN_OPEN_SOURCE := 1
+
+ifeq ($(WLAN_OPEN_SOURCE),1)
CDEFINES += -DWLAN_OPEN_SOURCE
endif
diff --git a/Makefile b/Makefile
index d5c94f0..d76aa10 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,19 @@
default: all
-KBUILD_OPTIONS := WLAN_ROOT=$(PWD)
-KBUILD_OPTIONS += MODNAME=wlan
+KBUILD_OPTIONS := WLAN_ROOT=$(shell cd $(KERNEL_SRC); readlink -e $(M))
+KBUILD_OPTIONS += MODNAME?=wlan
-all::
- $(MAKE) -C $(KERNEL_SOURCE) $(KBUILD_OPTIONS) $(EXTRA_CFLAGS) ARCH=$(ARCH) \
- SUBDIRS=$(CURDIR) CC=${CC} modules
+WLAN_CHIPSET := pronto
+WLAN_SELECT := CONFIG_PRONTO_WLAN=m
+
+KBUILD_OPTIONS += BOARD_PLATFORM=msm8909
+KBUILD_OPTIONS += $(WLAN_SELECT)
+
+all:
+ $(MAKE) -C $(KERNEL_SRC) M=$(M) modules $(KBUILD_OPTIONS)
modules_install:
- $(MAKE) INSTALL_MOD_STRIP=1 -C $(KERNEL_SRC) M=$(shell pwd) modules_install
+ $(MAKE) INSTALL_MOD_STRIP=1 M=$(M) -C $(KERNEL_SRC) modules_install
clean::
rm -f *.o *.ko *.mod.c *.mod.o *~ .*.cmd Module.symvers
