diff options
| author | Jeff Johnson <jjohnson@qca.qualcomm.com> | 2014-04-09 15:43:07 -0700 |
|---|---|---|
| committer | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-04-11 08:44:25 -0700 |
| commit | fe7153303d2575b6b4cb03ad22f906599c1f4f83 (patch) | |
| tree | 479cb37bd6fd16a7cd2d8290f8d66d714fdf4b87 | |
| parent | 1cc86add6f4f96c8ad24ae646819f2bfedddf7de (diff) | |
wlan: Update SMD and SMSM header includes (revised)
Commit "wlan: Update SMD and SMSM header includes" added a mechanism
to determine which SMD and SMSM include files are present in the
kernel. This change utilized modifications to both Android.mk and
Kbuild to make this determination. This works fine when the wlan
driver is being built as part of an Android build (and hence
Android.mk and Kbuild are both used), but this does not work when the
wlan driver is being built as part of a kernel build (and hence Kbuild
alone is used), such as with Nexus products. Remove the logic that
was added to Android.mk, and instead add equivalent logic to Kbuild.
Change-Id: I84915b26d1b4ed0b5e1342c38f600132375d78b0
CRs-fixed: 640743
| -rw-r--r-- | Android.mk | 12 | ||||
| -rw-r--r-- | Kbuild | 7 |
2 files changed, 5 insertions, 14 deletions
diff --git a/Android.mk b/Android.mk index b6156c20261d..d95df2a44831 100644 --- a/Android.mk +++ b/Android.mk @@ -41,17 +41,6 @@ else DLKM_DIR := build/dlkm endif -# Some kernel include files are being moved. Check to see if -# the old version of the files are present -INCLUDE_SELECT := -ifneq ($(wildcard $(TOP)/kernel//arch/arm/mach-msm/include/mach/msm_smd.h),) - INCLUDE_SELECT += EXISTS_MSM_SMD=1 -endif - -ifneq ($(wildcard $(TOP)/kernel//arch/arm/mach-msm/include/mach/msm_smsm.h),) - INCLUDE_SELECT += EXISTS_MSM_SMSM=1 -endif - # Build wlan.ko as either prima_wlan.ko or pronto_wlan.ko or qca_cld_wlan.ko ########################################################### # This is set once per LOCAL_PATH, not per (kernel) module @@ -63,7 +52,6 @@ KBUILD_OPTIONS := WLAN_ROOT=../$(WLAN_BLD_DIR)/qcacld-2.0 KBUILD_OPTIONS += MODNAME=wlan KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM) KBUILD_OPTIONS += $(WLAN_SELECT) -KBUILD_OPTIONS += $(INCLUDE_SELECT) KBUILD_OPTIONS += $(WLAN_ISOC_SELECT) KBUILD_OPTIONS += WLAN_OPEN_SOURCE=$(WLAN_OPEN_SOURCE) @@ -1150,11 +1150,14 @@ ifeq ($(CONFIG_TARGET_RAMDUMP_AFTER_KERNEL_PANIC), 1) CDEFINES += -DTARGET_RAMDUMP_AFTER_KERNEL_PANIC endif -ifeq ($(EXISTS_MSM_SMD),1) +# Some kernel include files are being moved. Check to see if +# the old version of the files are present + +ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/mach-msm/include/mach/msm_smd.h),) CDEFINES += -DEXISTS_MSM_SMD endif -ifeq ($(EXISTS_MSM_SMSM),1) +ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/mach-msm/include/mach/msm_smsm.h),) CDEFINES += -DEXISTS_MSM_SMSM endif |