net: wireless: bcmdhd: Remove RTT support for BCM4354

Bug: 22567450

Signed-off-by: Ecco Park <eccopark@broadcom.com>
Change-Id: I400c564c5ac596796545f310d7453de2526460d0

drivers/net/wireless/bcmdhd/Makefile

@@ -56,7 +56,6 @@ DHDCFLAGS += -DMIRACAST_AMPDU_SIZE=8
 
 #Gscan
 DHDCFLAGS += -DGSCAN_SUPPORT
-DHDCFLAGS += -DRTT_SUPPORT -DRTT_DEBUG
 DHDCFLAGS += -DWL_VENDOR_EXT_SUPPORT
 #Link Statistics
 DHDCFLAGS += -DLINKSTAT_SUPPORT
@@ -132,6 +131,7 @@ ifneq ($(CONFIG_BCM4358),)
   DHDCFLAGS += -DMFP
   DHDCFLAGS += -DDHD_ENABLE_LPC
   DHDCFLAGS += -DCUSTOM_COUNTRY_CODE
+  DHDCFLAGS += -DRTT_SUPPORT -DRTT_DEBUG
 
 #  DHDCFLAGS += -DSAR_SUPPORT
 
@@ -205,6 +205,9 @@ ifneq ($(filter y, $(CONFIG_BCM4354) $(CONFIG_BCM4356)),)
 # debug info
   DHDCFLAGS += -DDHD_WAKE_STATUS -DDHD_WAKE_RX_STATUS
   DHDCFLAGS += -DDHD_WAKE_EVENT_STATUS
+ifneq ($(CONFIG_BCM4356),)
+  DHDCFLAGS += -DRTT_SUPPORT -DRTT_DEBUG
+endif
 
 ifneq ($(CONFIG_BCMDHD_SDIO),)
   DHDCFLAGS += -DBDC -DOOB_INTR_ONLY -DHW_OOB -DDHD_BCMEVENTS -DMMC_SDIO_ABORT

drivers/net/wireless/bcmdhd/dhd.h

@@ -351,9 +351,7 @@ typedef struct dhd_pub {
 #ifdef PNO_SUPPORT
 	void *pno_state;
 #endif
-#ifdef RTT_SUPPORT
 	void *rtt_state;
-#endif
 #ifdef ROAM_AP_ENV_DETECTION
 	bool	roam_env_detection;
 #endif