forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-10-12 a5969cabbb4660eab42b6ef0412cbbd1200cf14d 
 kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
old mode 100644new mode 100755
....@@ -4,7 +4,7 @@
44 MODULE_NAME := bcmdhd
55 CONFIG_BCMDHD ?= m
66 
7
-CONFIG_BCMDHD_SDIO := y
7
+#CONFIG_BCMDHD_SDIO := y
88 #CONFIG_BCMDHD_PCIE := y
99 #CONFIG_BCMDHD_USB := y
1010 
....@@ -14,51 +14,47 @@
1414 CONFIG_BCMDHD_PROPTXSTATUS := y
1515 CONFIG_BCMDHD_AG := y
1616 CONFIG_DHD_USE_STATIC_BUF := y
17
-CONFIG_BCMDHD_STATIC_BUF_IN_DHD := y
18
-CONFIG_BCMDHD_ANDROID_VERSION := 11
17
+#CONFIG_BCMDHD_STATIC_BUF_IN_DHD := y
18
+CONFIG_BCMDHD_ANDROID_VERSION := 12
1919 CONFIG_BCMDHD_AUTO_SELECT := y
2020 CONFIG_BCMDHD_DEBUG := y
21
-#CONFIG_BCMDHD_RECONNECT := y
2221 #CONFIG_BCMDHD_TIMESTAMP := y
2322 #CONFIG_BCMDHD_WAPI := y
2423 #CONFIG_BCMDHD_RANDOM_MAC := y
25
-#CONFIG_BCMDHD_REQUEST_FW := y
24
+CONFIG_BCMDHD_REQUEST_FW := y
25
+#CONFIG_BCMDHD_MULTIPLE_DRIVER := y
2626 #CONFIG_BCMDHD_DWDS := y
2727 CONFIG_BCMDHD_TPUT := y
28
-
29
-#CONFIG_BCMDHD_MULTIPLE_DRIVER := y
30
-#CONFIG_BCMDHD_ADAPTER_INDEX := 0
3128 
3229 CONFIG_MACH_PLATFORM := y
3330 #CONFIG_BCMDHD_DTS := y
3431 
3532 DHDCFLAGS = -Wall -Wstrict-prototypes -Wno-date-time                      \
3633 	-Wno-implicit-fallthrough -Wno-declaration-after-statement            \
37
-	-Wno-fortify-source -Wframe-larger-than=4096                          \
34
+	-Wno-vla -Wno-vla-extension                                           \
3835 	-Dlinux -DLINUX -DBCMDRIVER                                           \
3936 	-DBCMDONGLEHOST -DBCMDMA32 -DBCMFILEIMAGE                             \
4037 	-DDHDTHREAD -DDHD_DEBUG -DSHOW_EVENTS -DGET_OTP_MAC_ENABLE            \
4138 	-DWIFI_ACT_FRAME -DARP_OFFLOAD_SUPPORT -DSUPPORT_PM2_ONLY             \
42
-	-DPKTPRIO_OVERRIDE                                                    \
4339 	-DKEEP_ALIVE -DPKT_FILTER_SUPPORT -DDHDTCPACK_SUPPRESS                \
4440 	-DDHD_DONOT_FORWARD_BCMEVENT_AS_NETWORK_PKT -DOEM_ANDROID             \
4541 	-DMULTIPLE_SUPPLICANT -DTSQ_MULTIPLIER -DMFP -DDHD_8021X_DUMP         \
4642 	-DPOWERUP_MAX_RETRY=0 -DIFACE_HANG_FORCE_DEV_CLOSE -DWAIT_DEQUEUE     \
4743 	-DUSE_NEW_RSPEC_DEFS -DBCM_USE_PLATFORM_STRLCPY                       \
4844 	-DWL_EXT_IAPSTA -DWL_ESCAN -DCCODE_LIST -DSUSPEND_EVENT               \
49
-	-DKEY_INSTALL_CHECK                                                   \
50
-	-DENABLE_INSMOD_NO_FW_LOAD
45
+	-DEAPOL_RESEND -DEAPOL_DYNAMATIC_RESEND -DWL_SCHED_SCAN               \
46
+	-DENABLE_INSMOD_NO_FW_LOAD -Wframe-larger-than=2048                   \
47
+	-DSCHED_SCAN_DELAYED_WORK -DDHD_PNO_FLAG
5148 
52
-DHDOFILES = aiutils.o siutils.o sbutils.o                                 \
53
-	bcmutils.o bcmwifi_channels.o bcmxtlv.o bcm_app_utils.o bcmstdlib_s.o \
49
+DHDOFILES = aiutils.o siutils.o sbutils.o bcmutils.o bcmwifi_channels.o   \
5450 	dhd_linux.o dhd_linux_platdev.o dhd_linux_sched.o dhd_pno.o           \
5551 	dhd_common.o dhd_ip.o dhd_linux_wq.o dhd_custom_gpio.o                \
5652 	bcmevent.o hndpmu.o linux_osl.o wldev_common.o wl_android.o           \
5753 	dhd_debug_linux.o dhd_debug.o dhd_mschdbg.o dhd_dbg_ring.o            \
58
-	hnd_pktq.o hnd_pktpool.o linux_pkt.o frag.o                           \
54
+	hnd_pktq.o hnd_pktpool.o bcmxtlv.o linux_pkt.o bcmstdlib_s.o frag.o   \
5955 	dhd_linux_exportfs.o dhd_linux_pktdump.o dhd_mschdbg.o                \
6056 	dhd_config.o dhd_ccode.o wl_event.o wl_android_ext.o                  \
61
-	wl_iapsta.o wl_escan.o wl_timer.o
57
+	wl_iapsta.o wl_escan.o
6258 
6359 ifneq ($(CONFIG_WIRELESS_EXT),)
6460 	DHDOFILES += wl_iw.o
....@@ -67,7 +63,7 @@
6763 ifneq ($(CONFIG_CFG80211),)
6864 	DHDOFILES += wl_cfg80211.o wl_cfgscan.o wl_cfgp2p.o
6965 	DHDOFILES += wl_linux_mon.o wl_cfg_btcoex.o wl_cfgvendor.o
70
-	DHDOFILES += dhd_cfg80211.o wl_cfgvif.o wl_roam.o
66
+	DHDOFILES += dhd_cfg80211.o wl_cfgvif.o
7167 	DHDCFLAGS += -DWL_CFG80211 -DWLP2P -DWL_CFG80211_STA_EVENT
7268 #	DHDCFLAGS += -DWL_IFACE_COMB_NUM_CHANNELS
7369 	DHDCFLAGS += -DCUSTOM_PNO_EVENT_LOCK_xTIME=10
....@@ -76,13 +72,14 @@
7672 	DHDCFLAGS += -DESCAN_RESULT_PATCH -DESCAN_BUF_OVERFLOW_MGMT
7773 	DHDCFLAGS += -DVSDB -DWL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST
7874 	DHDCFLAGS += -DWLTDLS -DMIRACAST_AMPDU_SIZE=8
79
-	DHDCFLAGS += -DWL_VIRTUAL_APSTA -DSTA_MGMT
75
+	DHDCFLAGS += -DWL_VIRTUAL_APSTA
8076 	DHDCFLAGS += -DPNO_SUPPORT -DEXPLICIT_DISCIF_CLEANUP
8177 	DHDCFLAGS += -DDHD_USE_SCAN_WAKELOCK
8278 	DHDCFLAGS += -DSPECIFIC_MAC_GEN_SCHEME
8379 	DHDCFLAGS += -DWL_IFACE_MGMT
8480 	DHDCFLAGS += -DWLFBT -DWL_GCMP_SUPPORT
85
-	DHDCFLAGS += -DROAM_CHANNEL_CACHE -DDHD_LOSSLESS_ROAMING -DWL_ROAM_WAR
81
+	DHDCFLAGS += -DWL_EXT_RECONNECT
82
+	DHDCFLAGS += -DDHD_LOSSLESS_ROAMING
8683 	DHDCFLAGS += -DGTK_OFFLOAD_SUPPORT
8784 	DHDCFLAGS += -DRESTART_AP_WAR
8885 #	DHDCFLAGS += -DWL_STATIC_IF
....@@ -91,12 +88,12 @@
9188 
9289 #BCMDHD_SDIO
9390 ifneq ($(CONFIG_BCMDHD_SDIO),)
94
-BUS_TYPE := sdio
95
-DHDCFLAGS += -DBCMSDIO -DMMC_SDIO_ABORT -DBCMLXSDMMC       \
91
+BUS_TYPE := "sdio"
92
+DHDCFLAGS += -DBCMSDIO -DMMC_SDIO_ABORT -DMMC_SW_RESET -DBCMLXSDMMC       \
9693 	-DUSE_SDIOFIFO_IOVAR -DSDTEST                                         \
9794 	-DBDC -DDHD_USE_IDLECOUNT -DCUSTOM_SDIO_F2_BLKSIZE=256                \
98
-	-DBCMSDIOH_TXGLOM -DBCMSDIOH_TXGLOM_EXT -DBCMSDIOH_STATIC_COPY_BUF    \
99
-	-DRXFRAME_THREAD -DDHDENABLE_TAILPAD -DSUPPORT_P2P_GO_PS              \
95
+	-DBCMSDIOH_TXGLOM -DBCMSDIOH_TXGLOM_EXT -DRXFRAME_THREAD              \
96
+	-DDHDENABLE_TAILPAD -DSUPPORT_P2P_GO_PS                               \
10097 	-DBCMSDIO_RXLIM_POST -DBCMSDIO_TXSEQ_SYNC -DCONSOLE_DPC               \
10198 	-DBCMSDIO_INTSTATUS_WAR
10299 ifeq ($(CONFIG_BCMDHD_OOB),y)
....@@ -113,14 +110,15 @@
113110 
114111 #BCMDHD_PCIE
115112 ifneq ($(CONFIG_BCMDHD_PCIE),)
116
-BUS_TYPE := pcie
113
+BUS_TYPE := "pcie"
117114 DHDCFLAGS += -DPCIE_FULL_DONGLE -DBCMPCIE -DCUSTOM_DPC_PRIO_SETTING=-1    \
118115 	-DDONGLE_ENABLE_ISOLATION
119116 DHDCFLAGS += -DDHD_LB -DDHD_LB_RXP -DDHD_LB_STATS -DDHD_LB_TXP
120
-DHDCFLAGS += -DDHD_PKTID_AUDIT_ENABLED
117
+#DHDCFLAGS += -DDHD_PKTID_AUDIT_ENABLED
121118 DHDCFLAGS += -DINSMOD_FW_LOAD
122
-DHDCFLAGS += -DCONFIG_HAS_WAKELOCK
119
+DHDCFLAGS += -DCHIP_INTR_CONTROL
123120 #DHDCFLAGS += -DDHD_PCIE_RUNTIMEPM -DMAX_IDLE_COUNT=11 -DCUSTOM_DHD_RUNTIME_MS=100
121
+DHDCFLAGS += -DDHD_CONTROL_PCIE_ASPM_WIFI_TURNON
124122 ifeq ($(CONFIG_BCMDHD_OOB),y)
125123 	DHDCFLAGS += -DCUSTOMER_OOB -DBCMPCIE_OOB_HOST_WAKE -DHW_OOB
126124 endif
....@@ -133,15 +131,10 @@
133131 
134132 #BCMDHD_USB
135133 ifneq ($(CONFIG_BCMDHD_USB),)
136
-BUS_TYPE := usb
134
+BUS_TYPE := "usb"
137135 DHDCFLAGS += -DUSBOS_TX_THREAD -DBCMDBUS -DBCMTRXV2 -DDBUS_USB_LOOPBACK   \
138136 	-DBDC
139
-DHDCFLAGS += -DINSMOD_FW_LOAD
140
-DHDCFLAGS += -DBCM_REQUEST_FW
141
-DHDCFLAGS += -DSHOW_LOGTRACE
142
-ifneq ($(CONFIG_BCMDHD_REQUEST_FW),y)
143
-	DHDCFLAGS += -DEXTERNAL_FW_PATH
144
-endif
137
+DHDCFLAGS += -DBCM_REQUEST_FW -DEXTERNAL_FW_PATH
145138 ifneq ($(CONFIG_BCMDHD_CUSB),)
146139 	DHDCFLAGS += -DBCMUSBDEV_COMPOSITE
147140 	CONFIG_BCMDHD_NO_POWER_OFF := y
....@@ -156,17 +149,9 @@
156149 
157150 ifeq ($(CONFIG_BCMDHD_MULTIPLE_DRIVER),y)
158151 	DHDCFLAGS += -DBCMDHD_MDRIVER
159
-ifneq ($(CONFIG_BCMDHD_ADAPTER_INDEX),)
160
-	CONFIG_BCMDHD_STATIC_BUF_IN_DHD := y
161
-	MODULE_NAME := dhd$(BUS_TYPE)_$(CONFIG_BCMDHD_ADAPTER_INDEX)
162
-	DHDCFLAGS += -DADAPTER_IDX=$(CONFIG_BCMDHD_ADAPTER_INDEX)
163
-	DHDCFLAGS += -DBUS_TYPE=\"-$(BUS_TYPE)-$(CONFIG_BCMDHD_ADAPTER_INDEX)\"
164
-	DHDCFLAGS += -DDHD_LOG_PREFIX=\"[dhd-$(BUS_TYPE)-$(CONFIG_BCMDHD_ADAPTER_INDEX)]\"
165
-else
166
-	MODULE_NAME := dhd$(BUS_TYPE)
167152 	DHDCFLAGS += -DBUS_TYPE=\"-$(BUS_TYPE)\"
168153 	DHDCFLAGS += -DDHD_LOG_PREFIX=\"[dhd-$(BUS_TYPE)]\"
169
-endif
154
+	MODULE_NAME := dhd$(BUS_TYPE)
170155 else
171156 	DHDCFLAGS += -DBUS_TYPE=\"\"
172157 endif
....@@ -198,16 +183,18 @@
198183 ifneq ($(CONFIG_BCMDHD_ANDROID_VERSION),)
199184 	DHDCFLAGS += -DANDROID_VERSION=$(CONFIG_BCMDHD_ANDROID_VERSION)
200185 	DHDCFLAGS += -DDHD_NOTIFY_MAC_CHANGED
201
-#	DHDCFLAGS += -DANDROID_BKPORT
202186 ifneq ($(CONFIG_CFG80211),)
203
-	DHDCFLAGS += -DGSCAN_SUPPORT -DRTT_SUPPORT -DLINKSTAT_SUPPORT
187
+	DHDCFLAGS += -DGSCAN_SUPPORT -DRTT_SUPPORT
188
+	DHDCFLAGS += -DWL_SAR_TX_POWER
189
+#	DHDCFLAGS += -DLINKSTAT_SUPPORT
204190 	DHDCFLAGS += -DCUSTOM_COUNTRY_CODE -DDHD_GET_VALID_CHANNELS
205191 	DHDCFLAGS += -DDEBUGABILITY -DDBG_PKT_MON
206192 #	DHDCFLAGS += -DDHD_LOG_DUMP
207193 	DHDCFLAGS += -DDHD_FW_COREDUMP
194
+	DHDCFLAGS += -DWL_P2P_RAND
208195 	DHDCFLAGS += -DAPF -DNDO_CONFIG_SUPPORT -DRSSI_MONITOR_SUPPORT
209196 	DHDCFLAGS += -DDHD_WAKE_STATUS -DWL_LATENCY_MODE
210
-	DHDOFILES += dhd_rtt.o
197
+	DHDOFILES += dhd_rtt.o bcm_app_utils.o
211198 endif
212199 else
213200 	DHDCFLAGS += -DANDROID_VERSION=0
....@@ -276,15 +263,6 @@
276263 	DHDOFILES += dhd_csi.o
277264 endif
278265 
279
-# For CONNECTION_IMPROVE
280
-ifeq ($(CONFIG_BCMDHD_RECONNECT),y)
281
-	DHDCFLAGS += -DEAPOL_RESEND -DEAPOL_RESEND_M4
282
-ifneq ($(CONFIG_CFG80211),)
283
-	DHDCFLAGS += -DWL_EXT_RECONNECT -DWL_REASSOC_BCAST
284
-	DHDCFLAGS += -DWL_EXT_DISCONNECT_RECONNECT
285
-endif 
286
-endif
287
-
288266 # For TPUT_IMPROVE
289267 ifeq ($(CONFIG_BCMDHD_TPUT),y)
290268 	DHDCFLAGS += -DDHD_TPUT_PATCH
....@@ -330,16 +308,12 @@
330308 # For Module auto-selection
331309 ifeq ($(CONFIG_BCMDHD_AUTO_SELECT),y)
332310 	DHDCFLAGS += -DUPDATE_MODULE_NAME
333
-ifeq ($(CONFIG_BCMDHD_REQUEST_FW),y)
334
-#	DHDCFLAGS += -DFW_AMPAK_PATH="\"ampak\""
335
-#	DHDCFLAGS += -DMODULE_PATH
336
-endif
337311 ifneq ($(CONFIG_BCMDHD_SDIO),)
338312 	DHDCFLAGS += -DGET_OTP_MODULE_NAME -DCOMPAT_OLD_MODULE
339313 endif
340314 endif
341315 
342
-ifeq ($(CONFIG_BCMDHD),m)
316
+ifeq ($(CONFIG_AP6XXX),m)
343317 	DHDCFLAGS += -DBCMDHD_MODULAR
344318 endif
345319 
....@@ -358,7 +332,6 @@
358332 	DHDCFLAGS += -DDHD_NVRAM_NAME="\"nvram.txt\""
359333 	DHDCFLAGS += -DDHD_CLM_NAME="\"clm_bcmdhd.blob\""
360334 else
361
-	DHDCFLAGS += -DDHD_SUPPORT_VFS_CALL
362335 ifeq ($(CONFIG_BCMDHD_FW_PATH),)
363336 	DHDCFLAGS += -DCONFIG_BCMDHD_FW_PATH="\"/system/etc/firmware/fw_bcmdhd.bin\""
364337 	DHDCFLAGS += -DCONFIG_BCMDHD_NVRAM_PATH="\"/system/etc/firmware/nvram.txt\""
....@@ -390,8 +363,9 @@
390363 #$(warning "BCMDHD_ROOT=$(BCMDHD_ROOT)")
391364 EXTRA_CFLAGS = $(DHDCFLAGS)
392365 EXTRA_CFLAGS += -DDHD_COMPILED=\"$(BCMDHD_ROOT)\"
393
-EXTRA_CFLAGS += -I$(BCMDHD_ROOT)/include/ -I$(BCMDHD_ROOT)/
394
-ifeq ($(CONFIG_BCMDHD),m)
366
+EXTRA_CFLAGS += -I$(srctree)/$(BCMDHD_ROOT)/include/ -I$(srctree)/$(BCMDHD_ROOT)/
367
+EXTRA_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
368
+ifeq ($(CONFIG_AP6XXX),m)
395369 EXTRA_LDFLAGS += --strip-debug
396370 endif
397371