[packages/rtl8812au] - udpated to current upstream git - added fixes for kernel 6.15
baggins
baggins at pld-linux.org
Mon Jun 16 22:49:13 CEST 2025
commit 69df4139e9dff58d14d11933dcd7a5b44e1da03b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Jun 17 00:48:25 2025 +0200
- udpated to current upstream git
- added fixes for kernel 6.15
kernel-6.13.patch | 27 -
kernel-6.14.patch | 12 -
kernel-6.15.patch | 1779 +++++++++++++++++++++++++++++++++++++++++++++++++++++
rtl8812au.spec | 14 +-
4 files changed, 1785 insertions(+), 47 deletions(-)
---
diff --git a/rtl8812au.spec b/rtl8812au.spec
index 757bd47..2313cae 100644
--- a/rtl8812au.spec
+++ b/rtl8812au.spec
@@ -5,27 +5,26 @@
# nothing to be placed to debuginfo package
%define _enable_debug_packages 0
-%define rel 3
+%define rel 1
%define basever 20210820
-%define snap 20240527
+%define snap 20250614
%define pname rtl8812au
Summary: Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter
Name: %{pname}%{_alt_kernel}
Version: 5.13.6.%{snap}
-Epoch: 2
+Epoch: 1
Release: %{rel}%{?_pld_builder:@%{_kernel_ver_str}}
License: GPL
Group: Base/Kernel
# Source0: https://github.com/morrownr/8812au-%{basever}/archive/main/%{pname}-%{version}.tar.gz
# git repo without huge blobs with Android SDKs under docs/
Source0: %{pname}-%{version}.tar.xz
-# Source0-md5: a4986d1bd51a7447dc240eb4eefaad27
+# Source0-md5: bc1212b5a427bf7419a7838837ef4fb7
Patch0: no-arch-override.patch
-Patch1: kernel-6.13.patch
-Patch2: kernel-6.14.patch
+Patch1: kernel-6.15.patch
# good luck finding this chip on Realtek website :/
#URL: http://www.realtek.com.tw/
-URL: https://github.com/morrownr/8812au
+URL: https://github.com/morrownr/8812au-20210820
BuildRequires: rpmbuild(macros) >= 1.701
%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}
BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
@@ -69,7 +68,6 @@ Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter\
%setup -q -n 8812au-%{basever}
%patch -P 0 -p1
%patch -P 1 -p1
-%patch -P 2 -p1
%build
%{expand:%build_kernel_packages}
diff --git a/kernel-6.13.patch b/kernel-6.13.patch
deleted file mode 100644
index 6111106..0000000
--- a/kernel-6.13.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 8812au-20210820/os_dep/linux/os_intfs.c~ 2024-05-27 23:46:08.000000000 +0200
-+++ 8812au-20210820/os_dep/linux/os_intfs.c 2025-01-23 00:43:01.529998643 +0100
-@@ -32,8 +32,12 @@
- * You can modify or add flags in the fs/Makefile.
- */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 13, 0)
-+ MODULE_IMPORT_NS("VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver");
-+#else
- MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver);
- #endif
-+#endif
-
- /* module param defaults */
- int rtw_chip_version = 0x00;
---- 8812au-20210820/os_dep/linux/ioctl_cfg80211.c~ 2024-05-27 23:46:08.000000000 +0200
-+++ 8812au-20210820/os_dep/linux/ioctl_cfg80211.c 2025-01-23 00:45:49.173331951 +0100
-@@ -6901,6 +6901,9 @@
-
- static int cfg80211_rtw_set_monitor_channel(struct wiphy *wiphy
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 13, 0))
-+ , struct net_device *dev
-+#endif
- , struct cfg80211_chan_def *chandef
- #else
- , struct ieee80211_channel *chan
diff --git a/kernel-6.14.patch b/kernel-6.14.patch
deleted file mode 100644
index 83d0f3f..0000000
--- a/kernel-6.14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 8812au-20210820/os_dep/linux/ioctl_cfg80211.c~ 2025-04-19 02:03:37.000000000 +0200
-+++ 8812au-20210820/os_dep/linux/ioctl_cfg80211.c 2025-04-19 02:07:48.229999557 +0200
-@@ -4650,6 +4650,9 @@
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
- struct wireless_dev *wdev,
- #endif
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0))
-+ unsigned int link_id,
-+#endif
- int *dbm)
- {
- struct dvobj_priv *dvobj = wiphy_to_dvobj(wiphy);
diff --git a/kernel-6.15.patch b/kernel-6.15.patch
new file mode 100644
index 0000000..0f2f384
--- /dev/null
+++ b/kernel-6.15.patch
@@ -0,0 +1,1779 @@
+--- 8812au-20210820/Makefile~ 2025-06-14 16:30:20.000000000 +0200
++++ 8812au-20210820/Makefile 2025-06-14 16:32:42.446665328 +0200
+@@ -1,54 +1,54 @@
+-EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)
+-EXTRA_CFLAGS += -O1
+-#EXTRA_CFLAGS += -O2 -std=gnu11 -Wno-declaration-after-statement
+-#EXTRA_CFLAGS += -O3
+-#EXTRA_CFLAGS += -Wall
+-#EXTRA_CFLAGS += -Wextra
+-#EXTRA_CFLAGS += -Werror
+-#EXTRA_CFLAGS += -pedantic
+-#EXTRA_CFLAGS += -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes
+-
+-EXTRA_CFLAGS += -Wno-unused-variable
+-#EXTRA_CFLAGS += -Wno-unused-value
+-#EXTRA_CFLAGS += -Wno-unused-label
+-#EXTRA_CFLAGS += -Wno-unused-parameter
+-#EXTRA_CFLAGS += -Wno-unused-function
+-EXTRA_CFLAGS += -Wno-unused
+-#EXTRA_CFLAGS += -Wno-uninitialized
+-EXTRA_CFLAGS += -Wno-vla
+-EXTRA_CFLAGS += -Wno-misleading-indentation
+-EXTRA_CFLAGS += -Wno-implicit-fallthrough
+-#EXTRA_CFLAGS += -Wno-return-type
+-#EXTRA_CFLAGS += -Wno-discarded-qualifiers
++ccflags-y += $(USER_EXTRA_CFLAGS)
++ccflags-y += -O1
++#ccflags-y += -O2 -std=gnu11 -Wno-declaration-after-statement
++#ccflags-y += -O3
++#ccflags-y += -Wall
++#ccflags-y += -Wextra
++#ccflags-y += -Werror
++#ccflags-y += -pedantic
++#ccflags-y += -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes
++
++ccflags-y += -Wno-unused-variable
++#ccflags-y += -Wno-unused-value
++#ccflags-y += -Wno-unused-label
++#ccflags-y += -Wno-unused-parameter
++#ccflags-y += -Wno-unused-function
++ccflags-y += -Wno-unused
++#ccflags-y += -Wno-uninitialized
++ccflags-y += -Wno-vla
++ccflags-y += -Wno-misleading-indentation
++ccflags-y += -Wno-implicit-fallthrough
++#ccflags-y += -Wno-return-type
++#ccflags-y += -Wno-discarded-qualifiers
+
+ # Activates Concurrent Mode if uncommented
+-#EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
++#ccflags-y += -DCONFIG_CONCURRENT_MODE
+
+ # Sets wireless regulatory (REGD) sourse to OS
+-EXTRA_CFLAGS += -DCONFIG_REGD_SRC_FROM_OS
++ccflags-y += -DCONFIG_REGD_SRC_FROM_OS
+ # May be needed to ensure all channels are scanned
+-EXTRA_CFLAGS += -DCONFIG_FORCE_SW_CHANNEL_PLAN
++ccflags-y += -DCONFIG_FORCE_SW_CHANNEL_PLAN
+
+ # gcc-12
+-EXTRA_CFLAGS += -Wno-address
+-EXTRA_CFLAGS += -Wframe-larger-than=1648
+-EXTRA_CFLAGS += -Wno-cast-function-type
++ccflags-y += -Wno-address
++ccflags-y += -Wframe-larger-than=1648
++ccflags-y += -Wno-cast-function-type
+
+ # gcc-13
+-EXTRA_CFLAGS += -Wno-enum-int-mismatch
+-EXTRA_CFLAGS += -Wno-stringop-overread
+-EXTRA_CFLAGS += -Wno-enum-conversion
+-EXTRA_CFLAGS += -Wno-int-in-bool-context
+-EXTRA_CFLAGS += -Wno-missing-prototypes
+-EXTRA_CFLAGS += -Wno-missing-declarations
+-EXTRA_CFLAGS += -Wno-empty-body
++ccflags-y += -Wno-enum-int-mismatch
++ccflags-y += -Wno-stringop-overread
++ccflags-y += -Wno-enum-conversion
++ccflags-y += -Wno-int-in-bool-context
++ccflags-y += -Wno-missing-prototypes
++ccflags-y += -Wno-missing-declarations
++ccflags-y += -Wno-empty-body
+
+ GCC_VER_49 := $(shell echo `$(CC) -dumpversion | cut -f1-2 -d.` \>= 4.9 | bc )
+ ifeq ($(GCC_VER_49),1)
+-EXTRA_CFLAGS += -Wno-date-time # Fix compile error && warning on gcc 4.9 and later
++ccflags-y += -Wno-date-time # Fix compile error && warning on gcc 4.9 and later
+ endif
+
+-EXTRA_CFLAGS += -I$(src)/include
++ccflags-y += -I$(src)/include
+
+ EXTRA_LDFLAGS += --strip-debug
+
+@@ -126,7 +126,7 @@
+ CONFIG_RTW_ANDROID = 0
+
+ ifeq ($(shell test $(CONFIG_RTW_ANDROID) -gt 0; echo $$?), 0)
+-EXTRA_CFLAGS += -DCONFIG_RTW_ANDROID=$(CONFIG_RTW_ANDROID)
++ccflags-y += -DCONFIG_RTW_ANDROID=$(CONFIG_RTW_ANDROID)
+ endif
+
+ ########################## Debug ###########################
+@@ -300,10 +300,10 @@
+ hal/led/hal_$(HCI_NAME)_led.o
+
+
+-EXTRA_CFLAGS += -I$(src)/platform
++ccflags-y += -I$(src)/platform
+ _PLATFORM_FILES := platform/platform_ops.o
+
+-EXTRA_CFLAGS += -I$(src)/hal/btc
++ccflags-y += -I$(src)/hal/btc
+
+ ########### HAL_RTL8188E #################################
+ ifeq ($(CONFIG_RTL8188E), y)
+@@ -324,7 +324,7 @@
+ ifeq ($(CONFIG_PCI_HCI), y)
+ MODULE_NAME = 8188ee
+ endif
+-EXTRA_CFLAGS += -DCONFIG_RTL8188E
++ccflags-y += -DCONFIG_RTL8188E
+
+ _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \
+ hal/$(RTL871X)/Hal8188EPwrSeq.o \
+@@ -381,7 +381,7 @@
+ ifeq ($(CONFIG_PCI_HCI), y)
+ MODULE_NAME = 8192ee
+ endif
+-EXTRA_CFLAGS += -DCONFIG_RTL8192E
++ccflags-y += -DCONFIG_RTL8192E
+ _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \
+ hal/$(RTL871X)/Hal8192EPwrSeq.o \
+ hal/$(RTL871X)/$(RTL871X)_xmit.o \
+@@ -489,7 +489,7 @@
+ endif
+
+ ifeq ($(CONFIG_RTL8812A), y)
+-EXTRA_CFLAGS += -DCONFIG_RTL8812A
++ccflags-y += -DCONFIG_RTL8812A
+ _HAL_INTFS_FILES += hal/rtl8812a/hal8812a_fw.o
+ endif
+
+@@ -514,7 +514,7 @@
+
+ endif
+
+-EXTRA_CFLAGS += -DCONFIG_RTL8821A
++ccflags-y += -DCONFIG_RTL8821A
+
+ _HAL_INTFS_FILES += hal/rtl8812a/hal8821a_fw.o
+
+@@ -547,7 +547,7 @@
+ MODULE_NAME = 8723bs
+ endif
+
+-EXTRA_CFLAGS += -DCONFIG_RTL8723B
++ccflags-y += -DCONFIG_RTL8723B
+
+ _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \
+ hal/$(RTL871X)/Hal8723BPwrSeq.o \
+@@ -594,7 +594,7 @@
+ ########### HAL_RTL8814A #################################
+ ifeq ($(CONFIG_RTL8814A), y)
+ ## ADD NEW VHT MP HW TX MODE ##
+-#EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE
++#ccflags-y += -DCONFIG_MP_VHT_HW_TX_MODE
+ #CONFIG_MP_VHT_HW_TX_MODE = y
+ ##########################################
+ RTL871X = rtl8814a
+@@ -608,7 +608,7 @@
+ MODULE_NAME = 8814as
+ endif
+
+-EXTRA_CFLAGS += -DCONFIG_RTL8814A
++ccflags-y += -DCONFIG_RTL8814A
+
+ _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \
+ hal/$(RTL871X)/Hal8814PwrSeq.o \
+@@ -669,7 +669,7 @@
+ MODULE_SUB_NAME = 8703bs
+ endif
+
+-EXTRA_CFLAGS += -DCONFIG_RTL8703B
++ccflags-y += -DCONFIG_RTL8703B
+
+ _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \
+ hal/$(RTL871X)/Hal8703BPwrSeq.o \
+@@ -725,7 +725,7 @@
+ MODULE_SUB_NAME = 8723ds
+ endif
+
+-EXTRA_CFLAGS += -DCONFIG_RTL8723D
++ccflags-y += -DCONFIG_RTL8723D
+
+ _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \
+ hal/$(RTL871X)/Hal8723DPwrSeq.o \
+@@ -793,7 +793,7 @@
+ MODULE_NAME = 8189fs
+ endif
+
+-EXTRA_CFLAGS += -DCONFIG_RTL8188F
++ccflags-y += -DCONFIG_RTL8188F
+
+ _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \
+ hal/$(RTL871X)/Hal8188FPwrSeq.o \
+@@ -840,7 +840,7 @@
+ MODULE_NAME = 8189gtvs
+ endif
+
+-EXTRA_CFLAGS += -DCONFIG_RTL8188GTV
++ccflags-y += -DCONFIG_RTL8188GTV
+
+ _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \
+ hal/$(RTL871X)/Hal8188GTVPwrSeq.o \
+@@ -918,7 +918,7 @@
+ MODULE_SUB_NAME = 8710bu
+ endif
+
+-EXTRA_CFLAGS += -DCONFIG_RTL8710B
++ccflags-y += -DCONFIG_RTL8710B
+
+ _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \
+ hal/$(RTL871X)/Hal8710BPwrSeq.o \
+@@ -965,7 +965,7 @@
+ MODULE_SUB_NAME = 8192fs
+ endif
+
+-EXTRA_CFLAGS += -DCONFIG_RTL8192F
++ccflags-y += -DCONFIG_RTL8192F
+
+ _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \
+ hal/$(RTL871X)/Hal8192FPwrSeq.o \
+@@ -1066,11 +1066,11 @@
+ ########### END OF PATH #################################
+
+ ifeq ($(CONFIG_AP_MODE), y)
+-EXTRA_CFLAGS += -DCONFIG_AP_MODE
++ccflags-y += -DCONFIG_AP_MODE
+ endif
+
+ ifeq ($(CONFIG_P2P), y)
+-EXTRA_CFLAGS += -DCONFIG_P2P
++ccflags-y += -DCONFIG_P2P
+ ifneq ($(CONFIG_AP_MODE), y)
+ $(error "CONFIG_AP_MODE is required for CONFIG_P2P")
+ endif
+@@ -1078,305 +1078,305 @@
+
+ ifeq ($(CONFIG_USB_HCI), y)
+ ifeq ($(CONFIG_USB_AUTOSUSPEND), y)
+-EXTRA_CFLAGS += -DCONFIG_USB_AUTOSUSPEND
++ccflags-y += -DCONFIG_USB_AUTOSUSPEND
+ endif
+ endif
+
+ ifeq ($(CONFIG_MP_INCLUDED), y)
+ #MODULE_NAME := $(MODULE_NAME)_mp
+-EXTRA_CFLAGS += -DCONFIG_MP_INCLUDED
++ccflags-y += -DCONFIG_MP_INCLUDED
+ endif
+
+ ifeq ($(CONFIG_POWER_SAVING), y)
+ ifneq ($(CONFIG_IPS_MODE), default)
+-EXTRA_CFLAGS += -DRTW_IPS_MODE=$(CONFIG_IPS_MODE)
++ccflags-y += -DRTW_IPS_MODE=$(CONFIG_IPS_MODE)
+ endif
+ ifneq ($(CONFIG_LPS_MODE), default)
+-EXTRA_CFLAGS += -DRTW_LPS_MODE=$(CONFIG_LPS_MODE)
++ccflags-y += -DRTW_LPS_MODE=$(CONFIG_LPS_MODE)
+ endif
+ ifneq ($(CONFIG_WOW_LPS_MODE), default)
+-EXTRA_CFLAGS += -DRTW_WOW_LPS_MODE=$(CONFIG_WOW_LPS_MODE)
++ccflags-y += -DRTW_WOW_LPS_MODE=$(CONFIG_WOW_LPS_MODE)
+ endif
+-EXTRA_CFLAGS += -DCONFIG_POWER_SAVING
++ccflags-y += -DCONFIG_POWER_SAVING
+ endif
+
+ ifeq ($(CONFIG_HW_PWRP_DETECTION), y)
+-EXTRA_CFLAGS += -DCONFIG_HW_PWRP_DETECTION
++ccflags-y += -DCONFIG_HW_PWRP_DETECTION
+ endif
+
+ ifeq ($(CONFIG_BT_COEXIST), y)
+-EXTRA_CFLAGS += -DCONFIG_BT_COEXIST
++ccflags-y += -DCONFIG_BT_COEXIST
+ endif
+
+ ifeq ($(CONFIG_WAPI_SUPPORT), y)
+-EXTRA_CFLAGS += -DCONFIG_WAPI_SUPPORT
++ccflags-y += -DCONFIG_WAPI_SUPPORT
+ endif
+
+
+ ifeq ($(CONFIG_EFUSE_CONFIG_FILE), y)
+-EXTRA_CFLAGS += -DCONFIG_EFUSE_CONFIG_FILE
++ccflags-y += -DCONFIG_EFUSE_CONFIG_FILE
+
+ #EFUSE_MAP_PATH
+ USER_EFUSE_MAP_PATH ?=
+ ifneq ($(USER_EFUSE_MAP_PATH),)
+-EXTRA_CFLAGS += -DEFUSE_MAP_PATH=\"$(USER_EFUSE_MAP_PATH)\"
++ccflags-y += -DEFUSE_MAP_PATH=\"$(USER_EFUSE_MAP_PATH)\"
+ else ifeq ($(MODULE_NAME), 8189es)
+-EXTRA_CFLAGS += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_8189e.map\"
++ccflags-y += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_8189e.map\"
+ else ifeq ($(MODULE_NAME), 8723bs)
+-EXTRA_CFLAGS += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_8723bs.map\"
++ccflags-y += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_8723bs.map\"
+ else
+-EXTRA_CFLAGS += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_$(MODULE_NAME).map\"
++ccflags-y += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_$(MODULE_NAME).map\"
+ endif
+
+ #WIFIMAC_PATH
+ USER_WIFIMAC_PATH ?=
+ ifneq ($(USER_WIFIMAC_PATH),)
+-EXTRA_CFLAGS += -DWIFIMAC_PATH=\"$(USER_WIFIMAC_PATH)\"
++ccflags-y += -DWIFIMAC_PATH=\"$(USER_WIFIMAC_PATH)\"
+ else
+-EXTRA_CFLAGS += -DWIFIMAC_PATH=\"/data/wifimac.txt\"
++ccflags-y += -DWIFIMAC_PATH=\"/data/wifimac.txt\"
+ endif
+
+ endif
+
+ ifeq ($(CONFIG_EXT_CLK), y)
+-EXTRA_CFLAGS += -DCONFIG_EXT_CLK
++ccflags-y += -DCONFIG_EXT_CLK
+ endif
+
+ ifeq ($(CONFIG_TRAFFIC_PROTECT), y)
+-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT
++ccflags-y += -DCONFIG_TRAFFIC_PROTECT
+ endif
+
+ ifeq ($(CONFIG_LOAD_PHY_PARA_FROM_FILE), y)
+-EXTRA_CFLAGS += -DCONFIG_LOAD_PHY_PARA_FROM_FILE
+-#EXTRA_CFLAGS += -DREALTEK_CONFIG_PATH_WITH_IC_NAME_FOLDER
+-EXTRA_CFLAGS += -DREALTEK_CONFIG_PATH=\"/lib/firmware/\"
++ccflags-y += -DCONFIG_LOAD_PHY_PARA_FROM_FILE
++#ccflags-y += -DREALTEK_CONFIG_PATH_WITH_IC_NAME_FOLDER
++ccflags-y += -DREALTEK_CONFIG_PATH=\"/lib/firmware/\"
+ endif
+
+ ifeq ($(CONFIG_TXPWR_BY_RATE), n)
+-EXTRA_CFLAGS += -DCONFIG_TXPWR_BY_RATE=0
++ccflags-y += -DCONFIG_TXPWR_BY_RATE=0
+ else ifeq ($(CONFIG_TXPWR_BY_RATE), y)
+-EXTRA_CFLAGS += -DCONFIG_TXPWR_BY_RATE=1
++ccflags-y += -DCONFIG_TXPWR_BY_RATE=1
+ endif
+ ifeq ($(CONFIG_TXPWR_BY_RATE_EN), n)
+-EXTRA_CFLAGS += -DCONFIG_TXPWR_BY_RATE_EN=0
++ccflags-y += -DCONFIG_TXPWR_BY_RATE_EN=0
+ else ifeq ($(CONFIG_TXPWR_BY_RATE_EN), y)
+-EXTRA_CFLAGS += -DCONFIG_TXPWR_BY_RATE_EN=1
++ccflags-y += -DCONFIG_TXPWR_BY_RATE_EN=1
+ else ifeq ($(CONFIG_TXPWR_BY_RATE_EN), auto)
+-EXTRA_CFLAGS += -DCONFIG_TXPWR_BY_RATE_EN=2
++ccflags-y += -DCONFIG_TXPWR_BY_RATE_EN=2
+ endif
+
+ ifeq ($(CONFIG_TXPWR_LIMIT), n)
+-EXTRA_CFLAGS += -DCONFIG_TXPWR_LIMIT=0
++ccflags-y += -DCONFIG_TXPWR_LIMIT=0
+ else ifeq ($(CONFIG_TXPWR_LIMIT), y)
+-EXTRA_CFLAGS += -DCONFIG_TXPWR_LIMIT=1
++ccflags-y += -DCONFIG_TXPWR_LIMIT=1
+ endif
+ ifeq ($(CONFIG_TXPWR_LIMIT_EN), n)
+-EXTRA_CFLAGS += -DCONFIG_TXPWR_LIMIT_EN=0
++ccflags-y += -DCONFIG_TXPWR_LIMIT_EN=0
+ else ifeq ($(CONFIG_TXPWR_LIMIT_EN), y)
+-EXTRA_CFLAGS += -DCONFIG_TXPWR_LIMIT_EN=1
++ccflags-y += -DCONFIG_TXPWR_LIMIT_EN=1
+ else ifeq ($(CONFIG_TXPWR_LIMIT_EN), auto)
+-EXTRA_CFLAGS += -DCONFIG_TXPWR_LIMIT_EN=2
++ccflags-y += -DCONFIG_TXPWR_LIMIT_EN=2
+ endif
+
+ ifneq ($(CONFIG_RTW_CHPLAN), 0xFF)
+-EXTRA_CFLAGS += -DCONFIG_RTW_CHPLAN=$(CONFIG_RTW_CHPLAN)
++ccflags-y += -DCONFIG_RTW_CHPLAN=$(CONFIG_RTW_CHPLAN)
+ endif
+
+ ifeq ($(CONFIG_CALIBRATE_TX_POWER_BY_REGULATORY), y)
+-EXTRA_CFLAGS += -DCONFIG_CALIBRATE_TX_POWER_BY_REGULATORY
++ccflags-y += -DCONFIG_CALIBRATE_TX_POWER_BY_REGULATORY
+ endif
+
+ ifeq ($(CONFIG_CALIBRATE_TX_POWER_TO_MAX), y)
+-EXTRA_CFLAGS += -DCONFIG_CALIBRATE_TX_POWER_TO_MAX
++ccflags-y += -DCONFIG_CALIBRATE_TX_POWER_TO_MAX
+ endif
+
+ ifeq ($(CONFIG_RTW_ADAPTIVITY_EN), disable)
+-EXTRA_CFLAGS += -DCONFIG_RTW_ADAPTIVITY_EN=0
++ccflags-y += -DCONFIG_RTW_ADAPTIVITY_EN=0
+ else ifeq ($(CONFIG_RTW_ADAPTIVITY_EN), enable)
+-EXTRA_CFLAGS += -DCONFIG_RTW_ADAPTIVITY_EN=1
++ccflags-y += -DCONFIG_RTW_ADAPTIVITY_EN=1
+ else ifeq ($(CONFIG_RTW_ADAPTIVITY_EN), auto)
+-EXTRA_CFLAGS += -DCONFIG_RTW_ADAPTIVITY_EN=2
++ccflags-y += -DCONFIG_RTW_ADAPTIVITY_EN=2
+ endif
+
+ ifeq ($(CONFIG_RTW_ADAPTIVITY_MODE), normal)
+-EXTRA_CFLAGS += -DCONFIG_RTW_ADAPTIVITY_MODE=0
++ccflags-y += -DCONFIG_RTW_ADAPTIVITY_MODE=0
+ else ifeq ($(CONFIG_RTW_ADAPTIVITY_MODE), carrier_sense)
+-EXTRA_CFLAGS += -DCONFIG_RTW_ADAPTIVITY_MODE=1
++ccflags-y += -DCONFIG_RTW_ADAPTIVITY_MODE=1
+ endif
+
+ ifeq ($(CONFIG_SIGNAL_SCALE_MAPPING), y)
+-EXTRA_CFLAGS += -DCONFIG_SIGNAL_SCALE_MAPPING
++ccflags-y += -DCONFIG_SIGNAL_SCALE_MAPPING
+ endif
+
+ ifeq ($(CONFIG_80211W), y)
+-EXTRA_CFLAGS += -DCONFIG_IEEE80211W
++ccflags-y += -DCONFIG_IEEE80211W
+ endif
+
+ ifeq ($(CONFIG_WOWLAN), y)
+-EXTRA_CFLAGS += -DCONFIG_WOWLAN -DRTW_WAKEUP_EVENT=$(CONFIG_WAKEUP_TYPE)
+-EXTRA_CFLAGS += -DRTW_SUSPEND_TYPE=$(CONFIG_SUSPEND_TYPE)
++ccflags-y += -DCONFIG_WOWLAN -DRTW_WAKEUP_EVENT=$(CONFIG_WAKEUP_TYPE)
++ccflags-y += -DRTW_SUSPEND_TYPE=$(CONFIG_SUSPEND_TYPE)
+ ifeq ($(CONFIG_WOW_STA_MIX), y)
+-EXTRA_CFLAGS += -DRTW_WOW_STA_MIX
++ccflags-y += -DRTW_WOW_STA_MIX
+ endif
+ ifeq ($(CONFIG_SDIO_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_RTW_SDIO_PM_KEEP_POWER
++ccflags-y += -DCONFIG_RTW_SDIO_PM_KEEP_POWER
+ endif
+ endif
+
+ ifeq ($(CONFIG_AP_WOWLAN), y)
+-EXTRA_CFLAGS += -DCONFIG_AP_WOWLAN
++ccflags-y += -DCONFIG_AP_WOWLAN
+ ifeq ($(CONFIG_AP_MODE), n)
+-EXTRA_CFLAGS += -DCONFIG_AP_MODE
++ccflags-y += -DCONFIG_AP_MODE
+ endif
+ ifeq ($(CONFIG_SDIO_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_RTW_SDIO_PM_KEEP_POWER
++ccflags-y += -DCONFIG_RTW_SDIO_PM_KEEP_POWER
+ endif
+ endif
+
+ ifeq ($(CONFIG_LAYER2_ROAMING), y)
+-EXTRA_CFLAGS += -DCONFIG_LAYER2_ROAMING -DCONFIG_ROAMING_FLAG=$(CONFIG_ROAMING_FLAG)
++ccflags-y += -DCONFIG_LAYER2_ROAMING -DCONFIG_ROAMING_FLAG=$(CONFIG_ROAMING_FLAG)
+ endif
+
+ ifeq ($(CONFIG_PNO_SUPPORT), y)
+-EXTRA_CFLAGS += -DCONFIG_PNO_SUPPORT
++ccflags-y += -DCONFIG_PNO_SUPPORT
+ ifeq ($(CONFIG_PNO_SET_DEBUG), y)
+-EXTRA_CFLAGS += -DCONFIG_PNO_SET_DEBUG
++ccflags-y += -DCONFIG_PNO_SET_DEBUG
+ endif
+ endif
+
+ ifeq ($(CONFIG_GPIO_WAKEUP), y)
+-EXTRA_CFLAGS += -DCONFIG_GPIO_WAKEUP
++ccflags-y += -DCONFIG_GPIO_WAKEUP
+ ifeq ($(CONFIG_ONE_PIN_GPIO), y)
+-EXTRA_CFLAGS += -DCONFIG_RTW_ONE_PIN_GPIO
++ccflags-y += -DCONFIG_RTW_ONE_PIN_GPIO
+ endif
+ ifeq ($(CONFIG_HIGH_ACTIVE_DEV2HST), y)
+-EXTRA_CFLAGS += -DHIGH_ACTIVE_DEV2HST=1
++ccflags-y += -DHIGH_ACTIVE_DEV2HST=1
+ else
+-EXTRA_CFLAGS += -DHIGH_ACTIVE_DEV2HST=0
++ccflags-y += -DHIGH_ACTIVE_DEV2HST=0
+ endif
+ endif
+
+ ifeq ($(CONFIG_HIGH_ACTIVE_HST2DEV), y)
+-EXTRA_CFLAGS += -DHIGH_ACTIVE_HST2DEV=1
++ccflags-y += -DHIGH_ACTIVE_HST2DEV=1
+ else
+-EXTRA_CFLAGS += -DHIGH_ACTIVE_HST2DEV=0
++ccflags-y += -DHIGH_ACTIVE_HST2DEV=0
+ endif
+
+ ifneq ($(CONFIG_WAKEUP_GPIO_IDX), default)
+-EXTRA_CFLAGS += -DWAKEUP_GPIO_IDX=$(CONFIG_WAKEUP_GPIO_IDX)
++ccflags-y += -DWAKEUP_GPIO_IDX=$(CONFIG_WAKEUP_GPIO_IDX)
+ endif
+
+ ifeq ($(CONFIG_RTW_SDIO_PM_KEEP_POWER), y)
+ ifeq ($(CONFIG_SDIO_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_RTW_SDIO_PM_KEEP_POWER
++ccflags-y += -DCONFIG_RTW_SDIO_PM_KEEP_POWER
+ endif
+ endif
+
+ ifeq ($(CONFIG_REDUCE_TX_CPU_LOADING), y)
+-EXTRA_CFLAGS += -DCONFIG_REDUCE_TX_CPU_LOADING
++ccflags-y += -DCONFIG_REDUCE_TX_CPU_LOADING
+ endif
+
+ ifeq ($(CONFIG_BR_EXT), y)
+ BR_NAME = br0
+-EXTRA_CFLAGS += -DCONFIG_BR_EXT
+-EXTRA_CFLAGS += '-DCONFIG_BR_EXT_BRNAME="'$(BR_NAME)'"'
++ccflags-y += -DCONFIG_BR_EXT
++ccflags-y += '-DCONFIG_BR_EXT_BRNAME="'$(BR_NAME)'"'
+ endif
+
+
+ ifeq ($(CONFIG_TDLS), y)
+-EXTRA_CFLAGS += -DCONFIG_TDLS
++ccflags-y += -DCONFIG_TDLS
+ endif
+
+ ifeq ($(CONFIG_WIFI_MONITOR), y)
+-EXTRA_CFLAGS += -DCONFIG_WIFI_MONITOR
++ccflags-y += -DCONFIG_WIFI_MONITOR
+ endif
+
+ ifeq ($(CONFIG_MCC_MODE), y)
+-EXTRA_CFLAGS += -DCONFIG_MCC_MODE
++ccflags-y += -DCONFIG_MCC_MODE
+ endif
+
+ ifeq ($(CONFIG_RTW_NAPI), y)
+-EXTRA_CFLAGS += -DCONFIG_RTW_NAPI
++ccflags-y += -DCONFIG_RTW_NAPI
+ endif
+
+ ifeq ($(CONFIG_RTW_GRO), y)
+-EXTRA_CFLAGS += -DCONFIG_RTW_GRO
++ccflags-y += -DCONFIG_RTW_GRO
+ endif
+
+ ifeq ($(CONFIG_RTW_REPEATER_SON), y)
+-EXTRA_CFLAGS += -DCONFIG_RTW_REPEATER_SON
++ccflags-y += -DCONFIG_RTW_REPEATER_SON
+ endif
+
+ ifeq ($(CONFIG_RTW_IPCAM_APPLICATION), y)
+-EXTRA_CFLAGS += -DCONFIG_RTW_IPCAM_APPLICATION
++ccflags-y += -DCONFIG_RTW_IPCAM_APPLICATION
+ ifeq ($(CONFIG_WIFI_MONITOR), n)
+-EXTRA_CFLAGS += -DCONFIG_WIFI_MONITOR
++ccflags-y += -DCONFIG_WIFI_MONITOR
+ endif
+ endif
+
+ ifeq ($(CONFIG_RTW_NETIF_SG), y)
+-EXTRA_CFLAGS += -DCONFIG_RTW_NETIF_SG
++ccflags-y += -DCONFIG_RTW_NETIF_SG
+ endif
+
+ ifeq ($(CONFIG_ICMP_VOQ), y)
+-EXTRA_CFLAGS += -DCONFIG_ICMP_VOQ
++ccflags-y += -DCONFIG_ICMP_VOQ
+ endif
+
+ ifeq ($(CONFIG_IP_R_MONITOR), y)
+-EXTRA_CFLAGS += -DCONFIG_IP_R_MONITOR
++ccflags-y += -DCONFIG_IP_R_MONITOR
+ endif
+
+ ifeq ($(CONFIG_LED_CONTROL), y)
+-EXTRA_CFLAGS += -DCONFIG_LED_CONTROL
++ccflags-y += -DCONFIG_LED_CONTROL
+ ifeq ($(CONFIG_RTL8812A), y)
+-EXTRA_CFLAGS += -DCONFIG_SW_LED -DCONFIG_RTW_SW_LED
++ccflags-y += -DCONFIG_SW_LED -DCONFIG_RTW_SW_LED
+ endif
+ ifeq ($(CONFIG_LED_ENABLE), y)
+-EXTRA_CFLAGS += -DCONFIG_LED_ENABLE
++ccflags-y += -DCONFIG_LED_ENABLE
+ endif
+ endif
+
+ ifeq ($(CONFIG_MP_VHT_HW_TX_MODE), y)
+-EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE
++ccflags-y += -DCONFIG_MP_VHT_HW_TX_MODE
+ ifeq ($(CONFIG_PLATFORM_I386_PC), y)
+ ## For I386 X86 ToolChain use Hardware FLOATING
+-EXTRA_CFLAGS += -mhard-float
++ccflags-y += -mhard-float
+ else
+ ## For ARM ToolChain use Hardware FLOATING
+-EXTRA_CFLAGS += -mfloat-abi=hard
++ccflags-y += -mfloat-abi=hard
+ endif
+ endif
+
+ ifeq ($(CONFIG_APPEND_VENDOR_IE_ENABLE), y)
+-EXTRA_CFLAGS += -DCONFIG_APPEND_VENDOR_IE_ENABLE
++ccflags-y += -DCONFIG_APPEND_VENDOR_IE_ENABLE
+ endif
+
+ ifeq ($(CONFIG_RTW_DEBUG), y)
+-EXTRA_CFLAGS += -DCONFIG_RTW_DEBUG
+-EXTRA_CFLAGS += -DRTW_LOG_LEVEL=$(CONFIG_RTW_LOG_LEVEL)
++ccflags-y += -DCONFIG_RTW_DEBUG
++ccflags-y += -DRTW_LOG_LEVEL=$(CONFIG_RTW_LOG_LEVEL)
+ endif
+
+ ifeq ($(CONFIG_PROC_DEBUG), y)
+-EXTRA_CFLAGS += -DCONFIG_PROC_DEBUG
++ccflags-y += -DCONFIG_PROC_DEBUG
+ endif
+
+ ifeq ($(CONFIG_RTW_UP_MAPPING_RULE), dscp)
+-EXTRA_CFLAGS += -DCONFIG_RTW_UP_MAPPING_RULE=1
++ccflags-y += -DCONFIG_RTW_UP_MAPPING_RULE=1
+ else
+-EXTRA_CFLAGS += -DCONFIG_RTW_UP_MAPPING_RULE=0
++ccflags-y += -DCONFIG_RTW_UP_MAPPING_RULE=0
+ endif
+
+-EXTRA_CFLAGS += -DDM_ODM_SUPPORT_TYPE=0x04
++ccflags-y += -DDM_ODM_SUPPORT_TYPE=0x04
+
+ ifeq ($(CONFIG_RTW_MBO), y)
+-EXTRA_CFLAGS += -DCONFIG_RTW_MBO -DCONFIG_RTW_80211K -DCONFIG_RTW_WNM -DCONFIG_RTW_BTM_ROAM
+-EXTRA_CFLAGS += -DCONFIG_RTW_80211R
++ccflags-y += -DCONFIG_RTW_MBO -DCONFIG_RTW_80211K -DCONFIG_RTW_WNM -DCONFIG_RTW_BTM_ROAM
++ccflags-y += -DCONFIG_RTW_80211R
+ endif
+
+ # *** AUTODETECT ***
+ ifeq ($(CONFIG_PLATFORM_AUTODETECT), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+
+ #SUBARCH := $(shell uname -m)
+ SUBARCH := $(shell uname -m | sed -e "s/i.86/i386/; s/ppc/powerpc/; s/armv.l/arm/; s/aarch64/arm64/; s/riscv.*/riscv/;")
+@@ -1390,14 +1390,14 @@
+ STAGINGMODDIR := /lib/modules/$(KVER)/kernel/drivers/staging
+
+ # Platform Specific Flags may be Needed in some Situations
+-#EXTRA_CFLAGS += -DCONFIG_PLATFORM_ANDROID
++#ccflags-y += -DCONFIG_PLATFORM_ANDROID
+ # End of Platform Specific Flags
+ endif
+ # *** End AUTODETECT ***
+
+ ifeq ($(CONFIG_PLATFORM_I386_PC), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+
+ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/)
+ ARCH ?= $(SUBARCH)
+@@ -1410,16 +1410,16 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_NV_TK1), y)
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_NV_TK1
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_PLATFORM_NV_TK1
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
+ # default setting for Android 4.1, 4.2
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_P2P_IPS -DCONFIG_PLATFORM_ANDROID
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_P2P_IPS -DCONFIG_PLATFORM_ANDROID
+ # Enable this for Android 5.0
+-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK
+-EXTRA_CFLAGS += -DRTW_VENDOR_EXT_SUPPORT
+-EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC
++ccflags-y += -DCONFIG_RADIO_WORK
++ccflags-y += -DRTW_VENDOR_EXT_SUPPORT
++ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC
+ ARCH ?= arm
+
+ CROSS_COMPILE := /mnt/newdisk/android_sdk/nvidia_tk1/android_L/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8/bin/arm-eabi-
+@@ -1428,9 +1428,9 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_NV_TK1_UBUNTU), y)
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_NV_TK1
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_PLATFORM_NV_TK1
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+
+ ARCH ?= arm
+
+@@ -1442,7 +1442,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ACTIONS_ATM702X), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ACTIONS_ATM702X
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ACTIONS_ATM702X
+ #ARCH := arm
+ ARCH := $(R_ARCH)
+ #CROSS_COMPILE := arm-none-linux-gnueabi-
+@@ -1455,18 +1455,18 @@
+
+
+ ifeq ($(CONFIG_PLATFORM_ACTIONS_ATM705X), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-#EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++#ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC
+ # default setting for Android 4.1, 4.2, 4.3, 4.4
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ACTIONS_ATM705X
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_PLATFORM_ACTIONS_ATM705X
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+
+ # Enable this for Android 5.0
+-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK
++ccflags-y += -DCONFIG_RADIO_WORK
+
+ ifeq ($(CONFIG_SDIO_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS
++ccflags-y += -DCONFIG_PLATFORM_OPS
+ _PLATFORM_FILES += platform/platform_arm_act_sdio.o
+ endif
+
+@@ -1476,20 +1476,20 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_SUN50IW1P1), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN50IW1P1
+-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN50IW1P1
++ccflags-y += -DCONFIG_TRAFFIC_PROTECT
+ # default setting for Android 4.1, 4.2
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+-EXTRA_CFLAGS += -DCONFIG_RESUME_IN_WORKQUEUE
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_RESUME_IN_WORKQUEUE
++ccflags-y += -DCONFIG_PLATFORM_OPS
+
+ # Enable this for Android 5.0
+-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK
++ccflags-y += -DCONFIG_RADIO_WORK
+
+ ifeq ($(CONFIG_USB_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
+ _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o
+ endif
+ ifeq ($(CONFIG_SDIO_HCI), y)
+@@ -1503,14 +1503,14 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_TI_AM3517), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_SHUTTLE
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_SHUTTLE
+ CROSS_COMPILE := arm-eabi-
+ KSRC := $(shell pwd)/../../../Android/kernel
+ ARCH := arm
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_MSTAR_TITANIA12), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MSTAR -DCONFIG_PLATFORM_MSTAR_TITANIA12
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MSTAR -DCONFIG_PLATFORM_MSTAR_TITANIA12
+ ARCH:=mips
+ CROSS_COMPILE:= /usr/src/Mstar_kernel/mips-4.3/bin/mips-linux-gnu-
+ KVER:= 2.6.28.9
+@@ -1518,13 +1518,13 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_MSTAR), y)
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_MSTAR
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_MSTAR_HIGH
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_PLATFORM_MSTAR
++ccflags-y += -DCONFIG_PLATFORM_MSTAR_HIGH
+ ifeq ($(CONFIG_USB_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX -DCONFIG_FIX_NR_BULKIN_BUFFER
++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX -DCONFIG_FIX_NR_BULKIN_BUFFER
+ endif
+ ARCH:=arm
+ CROSS_COMPILE:= /usr/src/bin/arm-none-linux-gnueabi-
+@@ -1533,7 +1533,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ANDROID_X86), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
+ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/)
+ ARCH := $(SUBARCH)
+ CROSS_COMPILE := /media/DATA-2/android-x86/ics-x86_20120130/prebuilt/linux-x86/toolchain/i686-unknown-linux-gnu-4.2.1/bin/i686-unknown-linux-gnu-
+@@ -1542,21 +1542,21 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ANDROID_INTEL_X86), y)
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ANDROID_INTEL_X86
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_INTEL_BYT
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+-EXTRA_CFLAGS += -DCONFIG_SKIP_SIGNAL_SCALE_MAPPING
++ccflags-y += -DCONFIG_PLATFORM_ANDROID_INTEL_X86
++ccflags-y += -DCONFIG_PLATFORM_INTEL_BYT
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_SKIP_SIGNAL_SCALE_MAPPING
+ ifeq ($(CONFIG_SDIO_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_RESUME_IN_WORKQUEUE
++ccflags-y += -DCONFIG_RESUME_IN_WORKQUEUE
+ endif
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_JB_X86), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/)
+ ARCH := $(SUBARCH)
+ CROSS_COMPILE := /home/android_sdk/android-x86_JB/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7/bin/i686-linux-android-
+@@ -1565,7 +1565,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_PXA2XX), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
+ ARCH := arm
+ CROSS_COMPILE := arm-none-linux-gnueabi-
+ KVER := 2.6.34.1
+@@ -1573,7 +1573,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_S3C2K4), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
+ ARCH := arm
+ CROSS_COMPILE := arm-linux-
+ KVER := 2.6.24.7_$(ARCH)
+@@ -1581,7 +1581,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_S3C6K4), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
+ ARCH := arm
+ CROSS_COMPILE := arm-none-linux-gnueabi-
+ KVER := 2.6.34.1
+@@ -1589,7 +1589,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_RTD2880B), y)
+-EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN -DCONFIG_PLATFORM_RTD2880B
++ccflags-y += -DCONFIG_BIG_ENDIAN -DCONFIG_PLATFORM_RTD2880B
+ ARCH:=
+ CROSS_COMPILE:=
+ KVER:=
+@@ -1597,7 +1597,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_MIPS_RMI), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
+ ARCH:=mips
+ CROSS_COMPILE:=mipsisa32r2-uclibc-
+ KVER:=
+@@ -1605,7 +1605,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_MIPS_PLM), y)
+-EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN
++ccflags-y += -DCONFIG_BIG_ENDIAN
+ ARCH:=mips
+ CROSS_COMPILE:=mipsisa32r2-uclibc-
+ KVER:=
+@@ -1613,7 +1613,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_MSTAR389), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MSTAR389
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MSTAR389
+ ARCH:=mips
+ CROSS_COMPILE:= mips-linux-gnu-
+ KVER:= 2.6.28.10
+@@ -1621,14 +1621,14 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_MIPS_AR9132), y)
+-EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN
++ccflags-y += -DCONFIG_BIG_ENDIAN
+ ARCH := mips
+ CROSS_COMPILE := mips-openwrt-linux-
+ KSRC := /home/alex/test_openwrt/tmp/linux-2.6.30.9
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_DMP_PHILIPS), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DRTK_DMP_PLATFORM
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DRTK_DMP_PLATFORM
+ ARCH := mips
+ #CROSS_COMPILE:=/usr/local/msdk-4.3.6-mips-EL-2.6.12.6-0.9.30.3/bin/mipsel-linux-
+ CROSS_COMPILE:=/usr/local/toolchain_mipsel/bin/mipsel-linux-
+@@ -1636,8 +1636,8 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_RTK_DMP), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DRTK_DMP_PLATFORM -DCONFIG_WIRELESS_EXT
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DRTK_DMP_PLATFORM -DCONFIG_WIRELESS_EXT
++ccflags-y += -DCONFIG_PLATFORM_OPS
+ ifeq ($(CONFIG_USB_HCI), y)
+ _PLATFORM_FILES += platform/platform_RTK_DMP_usb.o
+ endif
+@@ -1648,7 +1648,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_MT53XX), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MT53XX
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MT53XX
+ ARCH:= arm
+ CROSS_COMPILE:= arm11_mtk_le-
+ KVER:= 2.6.27
+@@ -1656,7 +1656,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_MX51_241H), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_WISTRON_PLATFORM
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_WISTRON_PLATFORM
+ ARCH := arm
+ CROSS_COMPILE := /opt/freescale/usr/local/gcc-4.1.2-glibc-2.5-nptl-3/arm-none-linux-gnueabi/bin/arm-none-linux-gnueabi-
+ KVER := 2.6.31
+@@ -1664,7 +1664,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_FS_MX61), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
+ ARCH := arm
+ CROSS_COMPILE := /home/share/CusEnv/FreeScale/arm-eabi-4.4.3/bin/arm-eabi-
+ KSRC ?= /home/share/CusEnv/FreeScale/FS_kernel_env
+@@ -1673,7 +1673,7 @@
+
+
+ ifeq ($(CONFIG_PLATFORM_ACTIONS_ATJ227X), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ACTIONS_ATJ227X
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ACTIONS_ATJ227X
+ ARCH := mips
+ CROSS_COMPILE := /home/cnsd4/project/actions/tools-2.6.27/bin/mipsel-linux-gnu-
+ KVER := 2.6.27
+@@ -1681,9 +1681,9 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_TI_DM365), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_TI_DM365
+-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_RX
+-EXTRA_CFLAGS += -DCONFIG_SINGLE_XMIT_BUF -DCONFIG_SINGLE_RECV_BUF
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_TI_DM365
++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_RX
++ccflags-y += -DCONFIG_SINGLE_XMIT_BUF -DCONFIG_SINGLE_RECV_BUF
+ ARCH := arm
+ #CROSS_COMPILE := /home/cnsd4/Appro/mv_pro_5.0/montavista/pro/devkit/arm/v5t_le/bin/arm_v5t_le-
+ #KSRC := /home/cnsd4/Appro/mv_pro_5.0/montavista/pro/devkit/lsp/ti-davinci/linux-dm365
+@@ -1694,7 +1694,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_MOZART), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MOZART
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MOZART
+ ARCH := arm
+ CROSS_COMPILE := /home/vivotek/lsp/mozart3v2/Mozart3e_Toolchain/build_arm_nofpu/usr/bin/arm-linux-
+ KVER := $(shell uname -r)
+@@ -1703,11 +1703,11 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_TEGRA3_CARDHU), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
+ # default setting for Android 4.1, 4.2
+-EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+ ARCH := arm
+ CROSS_COMPILE := /home/android_sdk/nvidia/tegra-16r3-partner-android-4.1_20120723/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi-
+ KSRC := /home/android_sdk/nvidia/tegra-16r3-partner-android-4.1_20120723/out/target/product/cardhu/obj/KERNEL
+@@ -1715,11 +1715,11 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_TEGRA4_DALMORE), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
+ # default setting for Android 4.1, 4.2
+-EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+ ARCH := arm
+ CROSS_COMPILE := /home/android_sdk/nvidia/tegra-17r9-partner-android-4.2-dalmore_20130131/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin/arm-eabi-
+ KSRC := /home/android_sdk/nvidia/tegra-17r9-partner-android-4.2-dalmore_20130131/out/target/product/dalmore/obj/KERNEL
+@@ -1727,7 +1727,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_TCC8900), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
+ ARCH := arm
+ CROSS_COMPILE := /home/android_sdk/Telechips/SDK_2304_20110613/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi-
+ KSRC := /home/android_sdk/Telechips/SDK_2304_20110613/kernel
+@@ -1735,7 +1735,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_TCC8920), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
+ ARCH := arm
+ CROSS_COMPILE := /home/android_sdk/Telechips/v12.06_r1-tcc-android-4.0.4/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi-
+ KSRC := /home/android_sdk/Telechips/v12.06_r1-tcc-android-4.0.4/kernel
+@@ -1743,10 +1743,10 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_TCC8920_JB42), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
+ # default setting for Android 4.1, 4.2
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+ ARCH := arm
+ CROSS_COMPILE := /home/android_sdk/Telechips/v13.03_r1-tcc-android-4.2.2_ds_patched/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin/arm-eabi-
+ KSRC := /home/android_sdk/Telechips/v13.03_r1-tcc-android-4.2.2_ds_patched/kernel
+@@ -1754,7 +1754,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_RK2818), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ROCKCHIPS
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ROCKCHIPS
+ ARCH := arm
+ CROSS_COMPILE := /usr/src/release_fae_version/toolchain/arm-eabi-4.4.0/bin/arm-eabi-
+ KSRC := /usr/src/release_fae_version/kernel25_A7_281x
+@@ -1762,14 +1762,14 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_RK3188), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ROCKCHIPS
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ROCKCHIPS
+ # default setting for Android 4.1, 4.2, 4.3, 4.4
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_CONCURRENT_MODE
+ # default setting for Power control
+-EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC
++ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC
+ ifeq ($(CONFIG_SDIO_HCI), y)
+-EXTRA_CFLAGS += -DRTW_SUPPORT_PLATFORM_SHUTDOWN
++ccflags-y += -DRTW_SUPPORT_PLATFORM_SHUTDOWN
+ endif
+ # default setting for Special function
+ ARCH := arm
+@@ -1779,15 +1779,15 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_RK3066), y)
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_RK3066
+-EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211
++ccflags-y += -DCONFIG_PLATFORM_ARM_RK3066
++ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211
+ ifeq ($(CONFIG_SDIO_HCI), y)
+-EXTRA_CFLAGS += -DRTW_SUPPORT_PLATFORM_SHUTDOWN
++ccflags-y += -DRTW_SUPPORT_PLATFORM_SHUTDOWN
+ endif
+-EXTRA_CFLAGS += -fno-pic
++ccflags-y += -fno-pic
+ ARCH := arm
+ CROSS_COMPILE := /home/android_sdk/Rockchip/rk3066_20130607/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6/bin/arm-linux-androideabi-
+ #CROSS_COMPILE := /home/android_sdk/Rockchip/Rk3066sdk/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6/bin/arm-linux-androideabi-
+@@ -1796,7 +1796,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_URBETTER), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN #-DCONFIG_MINIMAL_MEMORY_USAGE
++ccflags-y += -DCONFIG_LITTLE_ENDIAN #-DCONFIG_MINIMAL_MEMORY_USAGE
+ ARCH := arm
+ CROSS_COMPILE := /media/DATA-1/urbetter/arm-2009q3/bin/arm-none-linux-gnueabi-
+ KSRC := /media/DATA-1/urbetter/ics-urbetter/kernel
+@@ -1804,7 +1804,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_TI_PANDA), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN #-DCONFIG_MINIMAL_MEMORY_USAGE
++ccflags-y += -DCONFIG_LITTLE_ENDIAN #-DCONFIG_MINIMAL_MEMORY_USAGE
+ ARCH := arm
+ #CROSS_COMPILE := /media/DATA-1/aosp/ics-aosp_20111227/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi-
+ #KSRC := /media/DATA-1/aosp/android-omap-panda-3.0_20120104
+@@ -1814,14 +1814,14 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_MIPS_JZ4760), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_MINIMAL_MEMORY_USAGE
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_MINIMAL_MEMORY_USAGE
+ ARCH ?= mips
+ CROSS_COMPILE ?= /mnt/sdb5/Ingenic/Umido/mips-4.3/bin/mips-linux-gnu-
+ KSRC ?= /mnt/sdb5/Ingenic/Umido/kernel
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_SZEBOOK), y)
+-EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN
++ccflags-y += -DCONFIG_BIG_ENDIAN
+ ARCH:=arm
+ CROSS_COMPILE:=/opt/crosstool2/bin/armeb-unknown-linux-gnueabi-
+ KVER:= 2.6.31.6
+@@ -1829,20 +1829,20 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_SUNxI), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUNxI
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_PLATFORM_ARM_SUNxI
+ # default setting for Android 4.1, 4.2
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS
++ccflags-y += -DCONFIG_PLATFORM_OPS
+ ifeq ($(CONFIG_USB_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
+ _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o
+ endif
+ ifeq ($(CONFIG_SDIO_HCI), y)
+ # default setting for A10-EVB mmc0
+-#EXTRA_CFLAGS += -DCONFIG_WITS_EVB_V13
++#ccflags-y += -DCONFIG_WITS_EVB_V13
+ _PLATFORM_FILES += platform/platform_ARM_SUNxI_sdio.o
+ endif
+
+@@ -1855,22 +1855,22 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_SUN6I), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN6I
+-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN6I
++ccflags-y += -DCONFIG_TRAFFIC_PROTECT
+ # default setting for Android 4.1, 4.2, 4.3, 4.4
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+-EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_QOS_OPTIMIZATION
+
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS
++ccflags-y += -DCONFIG_PLATFORM_OPS
+ ifeq ($(CONFIG_USB_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
+ _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o
+ endif
+ ifeq ($(CONFIG_SDIO_HCI), y)
+ # default setting for A31-EVB mmc0
+-EXTRA_CFLAGS += -DCONFIG_A31_EVB
++ccflags-y += -DCONFIG_A31_EVB
+ _PLATFORM_FILES += platform/platform_ARM_SUNnI_sdio.o
+ endif
+
+@@ -1887,17 +1887,17 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_SUN7I), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN7I
+-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN7I
++ccflags-y += -DCONFIG_TRAFFIC_PROTECT
+ # default setting for Android 4.1, 4.2, 4.3, 4.4
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+-EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_QOS_OPTIMIZATION
+
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS
++ccflags-y += -DCONFIG_PLATFORM_OPS
+ ifeq ($(CONFIG_USB_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
+ _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o
+ endif
+ ifeq ($(CONFIG_SDIO_HCI), y)
+@@ -1917,17 +1917,17 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_SUN8I_W3P1), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN8I
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN8I_W3P1
+-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN8I
++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN8I_W3P1
++ccflags-y += -DCONFIG_TRAFFIC_PROTECT
+ # default setting for Android 4.1, 4.2
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS
++ccflags-y += -DCONFIG_PLATFORM_OPS
+ ifeq ($(CONFIG_USB_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
+ _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o
+ endif
+ ifeq ($(CONFIG_SDIO_HCI), y)
+@@ -1944,20 +1944,20 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_SUN8I_W5P1), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN8I
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN8I_W5P1
+-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN8I
++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN8I_W5P1
++ccflags-y += -DCONFIG_TRAFFIC_PROTECT
+ # default setting for Android 4.1, 4.2
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+
+ # Enable this for Android 5.0
+-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK
++ccflags-y += -DCONFIG_RADIO_WORK
+
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS
++ccflags-y += -DCONFIG_PLATFORM_OPS
+ ifeq ($(CONFIG_USB_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
+ _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o
+ endif
+ ifeq ($(CONFIG_SDIO_HCI), y)
+@@ -1971,8 +1971,8 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ACTIONS_ATV5201), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ACTIONS_ATV5201
+-EXTRA_CFLAGS += -DCONFIG_SDIO_DISABLE_RXFIFO_POLLING_LOOP
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ACTIONS_ATV5201
++ccflags-y += -DCONFIG_SDIO_DISABLE_RXFIFO_POLLING_LOOP
+ ARCH := mips
+ CROSS_COMPILE := mipsel-linux-gnu-
+ KVER := $(KERNEL_VER)
+@@ -1980,13 +1980,13 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_RTD299X), y)
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_RTD299X
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_PLATFORM_ARM_RTD299X
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+ ifeq ($(CONFIG_ANDROID), y)
+ # Enable this for Android 5.0
+-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK
++ccflags-y += -DCONFIG_RADIO_WORK
+ endif
+ #ARCH, CROSS_COMPILE, KSRC,and MODDESTDIR are provided by external makefile
+ INSTALL_PREFIX :=
+@@ -1994,17 +1994,17 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_RTD299X_LG), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DRTW_P2P_GROUP_INTERFACE=1
+-EXTRA_CFLAGS += -DCONFIG_IFACE_NUMBER=3
+-#EXTRA_CFLAGS += -DCONFIG_FIX_HWPORT
+-EXTRA_CFLAGS += -DLGE_PRIVATE
+-EXTRA_CFLAGS += -DPURE_SUPPLICANT
+-EXTRA_CFLAGS += -DCONFIG_CUSTOMIZED_COUNTRY_CHPLAN_MAP -DCONFIG_RTW_IOCTL_SET_COUNTRY
+-EXTRA_CFLAGS += -DDBG_RX_DFRAME_RAW_DATA
+-EXTRA_CFLAGS += -DRTW_REDUCE_SCAN_SWITCH_CH_TIME
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DRTW_P2P_GROUP_INTERFACE=1
++ccflags-y += -DCONFIG_IFACE_NUMBER=3
++#ccflags-y += -DCONFIG_FIX_HWPORT
++ccflags-y += -DLGE_PRIVATE
++ccflags-y += -DPURE_SUPPLICANT
++ccflags-y += -DCONFIG_CUSTOMIZED_COUNTRY_CHPLAN_MAP -DCONFIG_RTW_IOCTL_SET_COUNTRY
++ccflags-y += -DDBG_RX_DFRAME_RAW_DATA
++ccflags-y += -DRTW_REDUCE_SCAN_SWITCH_CH_TIME
+ ARCH ?= arm
+ KVER ?=
+
+@@ -2020,11 +2020,11 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_HISILICON), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_HISILICON
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_HISILICON
+ ifeq ($(SUPPORT_CONCURRENT),y)
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_CONCURRENT_MODE
+ endif
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+ ARCH := arm
+ ifeq ($(CROSS_COMPILE),)
+ CROSS_COMPILE = arm-hisiv200-linux-
+@@ -2036,23 +2036,23 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_HISILICON_HI3798), y)
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_HISILICON
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_HISILICON_HI3798
+-#EXTRA_CFLAGS += -DCONFIG_PLATFORM_HISILICON_HI3798_MV200_HDMI_DONGLE
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_PLATFORM_HISILICON
++ccflags-y += -DCONFIG_PLATFORM_HISILICON_HI3798
++#ccflags-y += -DCONFIG_PLATFORM_HISILICON_HI3798_MV200_HDMI_DONGLE
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
+ # default setting for Android
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211
+-EXTRA_CFLAGS += -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211
++ccflags-y += -DRTW_USE_CFG80211_STA_EVENT
+ # default setting for Android 5.x and later
+-#EXTRA_CFLAGS += -DCONFIG_RADIO_WORK
++#ccflags-y += -DCONFIG_RADIO_WORK
+
+ # If system could power on and recognize Wi-Fi SDIO automatically,
+ # platfrom operations are not necessary.
+ #ifeq ($(CONFIG_SDIO_HCI), y)
+-#EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS
++#ccflags-y += -DCONFIG_PLATFORM_OPS
+ #_PLATFORM_FILES += platform/platform_hisilicon_hi3798_sdio.o
+-#EXTRA_CFLAGS += -DCONFIG_HISI_SDIO_ID=1
++#ccflags-y += -DCONFIG_HISI_SDIO_ID=1
+ #endif
+
+ ARCH ?= arm
+@@ -2074,41 +2074,41 @@
+ # Platform setting
+ ifeq ($(CONFIG_PLATFORM_ARM_SPREADTRUM_6820), y)
+ ifeq ($(CONFIG_ANDROID_2X), y)
+-EXTRA_CFLAGS += -DANDROID_2X
++ccflags-y += -DANDROID_2X
+ endif
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_SPRD
+-EXTRA_CFLAGS += -DPLATFORM_SPREADTRUM_6820
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_PLATFORM_SPRD
++ccflags-y += -DPLATFORM_SPREADTRUM_6820
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
+ ifeq ($(RTL871X), rtl8188e)
+-EXTRA_CFLAGS += -DSOFTAP_PS_DURATION=50
++ccflags-y += -DSOFTAP_PS_DURATION=50
+ endif
+ ifeq ($(CONFIG_SDIO_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS
++ccflags-y += -DCONFIG_PLATFORM_OPS
+ _PLATFORM_FILES += platform/platform_sprd_sdio.o
+ endif
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_SPREADTRUM_8810), y)
+ ifeq ($(CONFIG_ANDROID_2X), y)
+-EXTRA_CFLAGS += -DANDROID_2X
++ccflags-y += -DANDROID_2X
+ endif
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_SPRD
+-EXTRA_CFLAGS += -DPLATFORM_SPREADTRUM_8810
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_PLATFORM_SPRD
++ccflags-y += -DPLATFORM_SPREADTRUM_8810
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
+ ifeq ($(RTL871X), rtl8188e)
+-EXTRA_CFLAGS += -DSOFTAP_PS_DURATION=50
++ccflags-y += -DSOFTAP_PS_DURATION=50
+ endif
+ ifeq ($(CONFIG_SDIO_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS
++ccflags-y += -DCONFIG_PLATFORM_OPS
+ _PLATFORM_FILES += platform/platform_sprd_sdio.o
+ endif
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_WMT), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_PLATFORM_OPS
+ ifeq ($(CONFIG_SDIO_HCI), y)
+ _PLATFORM_FILES += platform/platform_ARM_WMT_sdio.o
+ endif
+@@ -2119,18 +2119,18 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_RTK119X), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-#EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN7I
+-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++#ccflags-y += -DCONFIG_PLATFORM_ARM_SUN7I
++ccflags-y += -DCONFIG_TRAFFIC_PROTECT
+ # default setting for Android 4.1, 4.2
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+-#EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION
+-EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++#ccflags-y += -DCONFIG_QOS_OPTIMIZATION
++ccflags-y += -DCONFIG_QOS_OPTIMIZATION
+
+-#EXTRA_CFLAGS += -DCONFIG_#PLATFORM_OPS
++#ccflags-y += -DCONFIG_#PLATFORM_OPS
+ ifeq ($(CONFIG_USB_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
+ #_PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o
+ endif
+ ifeq ($(CONFIG_SDIO_HCI), y)
+@@ -2151,16 +2151,16 @@
+
+ # Actions-Micro use this flag for DHC 1195 and DHC 1395
+ ifeq ($(CONFIG_PLATFORM_RTK119X_AM), y)
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_RTK119X_AM
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_FULL_CH_IN_P2P_HANDSHAKE
+-EXTRA_CFLAGS += -DCONFIG_SEL_P2P_IFACE=2
+-EXTRA_CFLAGS += -DCONFIG_IFACE_NUMBER=3
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_PLATFORM_RTK119X_AM
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_FULL_CH_IN_P2P_HANDSHAKE
++ccflags-y += -DCONFIG_SEL_P2P_IFACE=2
++ccflags-y += -DCONFIG_IFACE_NUMBER=3
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+
+ ifeq ($(CONFIG_USB_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
+ endif
+
+ ARCH := arm
+@@ -2172,28 +2172,28 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_RTK129X), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_RTK129X
+-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_PLATFORM_RTK129X
++ccflags-y += -DCONFIG_TRAFFIC_PROTECT
+ # default setting for Android 4.1, 4.2
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+-#EXTRA_CFLAGS += -DCONFIG_P2P_IPS -DCONFIG_QOS_OPTIMIZATION
+-EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++#ccflags-y += -DCONFIG_P2P_IPS -DCONFIG_QOS_OPTIMIZATION
++ccflags-y += -DCONFIG_QOS_OPTIMIZATION
+ # Enable this for Android 5.0
+-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK
++ccflags-y += -DCONFIG_RADIO_WORK
+ ifeq ($(CONFIG_RTL8821C)$(CONFIG_SDIO_HCI),yy)
+-EXTRA_CFLAGS += -DCONFIG_WAKEUP_GPIO_INPUT_MODE
+-EXTRA_CFLAGS += -DCONFIG_BT_WAKE_HST_OPEN_DRAIN
++ccflags-y += -DCONFIG_WAKEUP_GPIO_INPUT_MODE
++ccflags-y += -DCONFIG_BT_WAKE_HST_OPEN_DRAIN
+ endif
+-EXTRA_CFLAGS += -Wno-error=date-time
++ccflags-y += -Wno-error=date-time
+ # default setting for Android 7.0
+ ifeq ($(RTK_ANDROID_VERSION), nougat)
+-EXTRA_CFLAGS += -DRTW_P2P_GROUP_INTERFACE=1
++ccflags-y += -DRTW_P2P_GROUP_INTERFACE=1
+ endif
+-#EXTRA_CFLAGS += -DCONFIG_#PLATFORM_OPS
++#ccflags-y += -DCONFIG_#PLATFORM_OPS
+ ifeq ($(CONFIG_USB_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
+ endif
+
+ ARCH := arm64
+@@ -2208,28 +2208,28 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_RTK1319), y)
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_RTK1319
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT
++ccflags-y += -DCONFIG_PLATFORM_RTK1319
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_TRAFFIC_PROTECT
+ # default setting for Android 4.1, 4.2
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+-#EXTRA_CFLAGS += -DCONFIG_P2P_IPS -DCONFIG_QOS_OPTIMIZATION
+-EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++#ccflags-y += -DCONFIG_P2P_IPS -DCONFIG_QOS_OPTIMIZATION
++ccflags-y += -DCONFIG_QOS_OPTIMIZATION
+ # Enable this for Android 5.0
+-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK
++ccflags-y += -DCONFIG_RADIO_WORK
+ ifeq ($(CONFIG_RTL8821C)$(CONFIG_SDIO_HCI),yy)
+-EXTRA_CFLAGS += -DCONFIG_WAKEUP_GPIO_INPUT_MODE
+-EXTRA_CFLAGS += -DCONFIG_BT_WAKE_HST_OPEN_DRAIN
++ccflags-y += -DCONFIG_WAKEUP_GPIO_INPUT_MODE
++ccflags-y += -DCONFIG_BT_WAKE_HST_OPEN_DRAIN
+ endif
+-EXTRA_CFLAGS += -Wno-error=date-time
++ccflags-y += -Wno-error=date-time
+ # default setting for Android 7.0
+ ifeq ($(RTK_ANDROID_VERSION), nougat)
+-EXTRA_CFLAGS += -DRTW_P2P_GROUP_INTERFACE=1
++ccflags-y += -DRTW_P2P_GROUP_INTERFACE=1
+ endif
+-#EXTRA_CFLAGS += -DCONFIG_#PLATFORM_OPS
++#ccflags-y += -DCONFIG_#PLATFORM_OPS
+ ifeq ($(CONFIG_USB_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
+ endif
+
+ ARCH := arm64
+@@ -2244,12 +2244,12 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_RTK390X), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_RTK390X
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+-EXTRA_CFLAGS += -DCONFIG_RTW_NETIF_SG
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_PLATFORM_RTK390X
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_RTW_NETIF_SG
+ ifeq ($(CONFIG_USB_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
+ endif
+
+ ARCH:=rlx
+@@ -2260,12 +2260,12 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_NOVATEK_NT72668), y)
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_NOVATEK_NT72668
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_RX
+-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
++ccflags-y += -DCONFIG_PLATFORM_NOVATEK_NT72668
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_RX
++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
+ ARCH ?= arm
+ CROSS_COMPILE := arm-linux-gnueabihf-
+ KVER := 3.8.0
+@@ -2274,10 +2274,10 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ARM_TCC8930_JB42), y)
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
+ # default setting for Android 4.1, 4.2
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+ ARCH := arm
+ CROSS_COMPILE := /home/android_sdk/Telechips/v13.05_r1-tcc-android-4.2.2_tcc893x-evm_build/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin/arm-eabi-
+ KSRC := /home/android_sdk/Telechips/v13.05_r1-tcc-android-4.2.2_tcc893x-evm_build/kernel
+@@ -2285,7 +2285,7 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_RTL8197D), y)
+-EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN -DCONFIG_PLATFORM_RTL8197D
++ccflags-y += -DCONFIG_BIG_ENDIAN -DCONFIG_PLATFORM_RTL8197D
+ export DIR_LINUX=$(shell pwd)/../SDK/rlxlinux-sdk321-v50/linux-2.6.30
+ ARCH ?= rlx
+ CROSS_COMPILE:= $(DIR_LINUX)/../toolchain/rsdk-1.5.5-5281-EB-2.6.30-0.9.30.3-110714/bin/rsdk-linux-
+@@ -2293,17 +2293,17 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_AML_S905), y)
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_AML_S905
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -fno-pic
++ccflags-y += -DCONFIG_PLATFORM_AML_S905
++ccflags-y += -DCONFIG_LITTLE_ENDIAN -fno-pic
+ # default setting for Android
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211
+-EXTRA_CFLAGS += -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211
++ccflags-y += -DRTW_USE_CFG80211_STA_EVENT
+ # default setting for Android 5.x and later
+-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK
++ccflags-y += -DCONFIG_RADIO_WORK
+
+ ifeq ($(CONFIG_SDIO_HCI), y)
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS
++ccflags-y += -DCONFIG_PLATFORM_OPS
+ _PLATFORM_FILES += platform/platform_aml_s905_sdio.o
+ endif
+
+@@ -2325,19 +2325,19 @@
+ endif
+
+ ifeq ($(CONFIG_PLATFORM_ZTE_ZX296716), y)
+-EXTRA_CFLAGS += -Wno-error=date-time
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ZTE_ZX296716
+-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++ccflags-y += -Wno-error=date-time
++ccflags-y += -DCONFIG_PLATFORM_ZTE_ZX296716
++ccflags-y += -DCONFIG_LITTLE_ENDIAN
+ # default setting for Android
+-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211
+-EXTRA_CFLAGS += -DRTW_USE_CFG80211_STA_EVENT
++ccflags-y += -DCONFIG_CONCURRENT_MODE
++ccflags-y += -DCONFIG_IOCTL_CFG80211
++ccflags-y += -DRTW_USE_CFG80211_STA_EVENT
+ # default setting for Android 5.x and later
+-#EXTRA_CFLAGS += -DCONFIG_RADIO_WORK
++#ccflags-y += -DCONFIG_RADIO_WORK
+
+ ifeq ($(CONFIG_SDIO_HCI), y)
+ # mark this temporarily
+-#EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS
++#ccflags-y += -DCONFIG_PLATFORM_OPS
+ #_PLATFORM_FILES += platform/platform_zte_zx296716_sdio.o
+ endif
+
+@@ -2360,13 +2360,13 @@
+ endif
+
+ ifeq ($(CONFIG_CUSTOMER_HUAWEI), y)
+-EXTRA_CFLAGS += -DCONFIG_HUAWEI_PROC
++ccflags-y += -DCONFIG_HUAWEI_PROC
+ endif
+
+ CONFIG_PLATFORM_CMAP_INTFS = n
+ ifeq ($(CONFIG_PLATFORM_CMAP_INTFS), y)
+ PLATFORM_CMAP_INTFS_TYPE = 00
+-EXTRA_CFLAGS += -DCONFIG_PLATFORM_CMAP_INTFS -DCMAP_UNASSOC_METRICS_STA_MAX=32
++ccflags-y += -DCONFIG_PLATFORM_CMAP_INTFS -DCMAP_UNASSOC_METRICS_STA_MAX=32
+ _OS_INTFS_FILES += os_dep/linux/custom_multiap_intfs/custom_multiap_intfs.o
+ _PLATFORM_FILES += platform/custom_multiap_intfs_$(PLATFORM_CMAP_INTFS_TYPE).o
+ endif
+@@ -2470,7 +2470,7 @@
+ rtk_core += core/rtw_sdio.o
+ endif
+
+-EXTRA_CFLAGS += -I$(src)/core/crypto
++ccflags-y += -I$(src)/core/crypto
+ rtk_core += \
+ core/crypto/aes-internal.o \
+ core/crypto/aes-internal-enc.o \
+--- 8812au-20210820/hal/phydm/phydm.mk~ 2025-06-14 16:30:21.000000000 +0200
++++ 8812au-20210820/hal/phydm/phydm.mk 2025-06-16 02:28:21.646665479 +0200
+@@ -1,4 +1,4 @@
+-EXTRA_CFLAGS += -I$(src)/hal/phydm
++ccflags-y += -I$(src)/hal/phydm
+
+ _PHYDM_FILES := hal/phydm/phydm_debug.o \
+ hal/phydm/phydm_antdiv.o\
+@@ -246,4 +246,4 @@
+ hal/phydm/halrf/$(RTL871X)/halrf_txgapk_8723f.o\
+ hal/phydm/halrf/$(RTL871X)/halrf_rfk_init_8723f.o\
+ hal/phydm/halrf/$(RTL871X)/halhwimg8723f_rf.o
+-endif
+\ No newline at end of file
++endif
+--- 8812au-20210820/hal/phydm/phydm_interface.c~ 2025-06-14 16:30:21.000000000 +0200
++++ 8812au-20210820/hal/phydm/phydm_interface.c 2025-06-17 00:20:34.719998573 +0200
+@@ -729,7 +729,11 @@
+ #elif (DM_ODM_SUPPORT_TYPE & ODM_CE) && defined(DM_ODM_CE_MAC80211)
+ del_timer(timer);
+ #elif (DM_ODM_SUPPORT_TYPE & ODM_CE) && defined(DM_ODM_CE_MAC80211_V2)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)
++ timer_delete(&timer->timer);
++#else
+ del_timer(&timer->timer);
++#endif
+ #elif (DM_ODM_SUPPORT_TYPE & ODM_CE)
+ _cancel_timer_ex(timer);
+ #elif (DM_ODM_SUPPORT_TYPE & ODM_WIN)
+--- 8812au-20210820/include/osdep_service_linux.h~ 2025-06-14 16:30:21.000000000 +0200
++++ 8812au-20210820/include/osdep_service_linux.h 2025-06-17 00:24:39.106665211 +0200
+@@ -387,12 +387,20 @@
+
+ __inline static void _cancel_timer(_timer *ptimer, u8 *bcancelled)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)
++ *bcancelled = timer_delete_sync(&ptimer->timer) == 1 ? 1 : 0;
++#else
+ *bcancelled = del_timer_sync(&ptimer->timer) == 1 ? 1 : 0;
++#endif
+ }
+
+ __inline static void _cancel_timer_async(_timer *ptimer)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)
++ timer_delete(&ptimer->timer);
++#else
+ del_timer(&ptimer->timer);
++#endif
+ }
+
+ static inline void _init_workitem(_workitem *pwork, void *pfunc, void *cntx)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rtl8812au.git/commitdiff/69df4139e9dff58d14d11933dcd7a5b44e1da03b
More information about the pld-cvs-commit
mailing list