diff --git a/Makefile b/Makefile index b9473d1..fcb2dd5 100755 --- a/Makefile +++ b/Makefile @@ -30,21 +30,11 @@ EXTRA_CFLAGS += -I$(src)/include EXTRA_LDFLAGS += --strip-debug -CONFIG_AUTOCFG_CP = n - ########################## WIFI IC ############################ CONFIG_MULTIDRV = n -CONFIG_RTL8188E = n CONFIG_RTL8812A = y CONFIG_RTL8821A = y -CONFIG_RTL8192E = n -CONFIG_RTL8723B = n CONFIG_RTL8814A = y -CONFIG_RTL8723C = n -CONFIG_RTL8188F = n -CONFIG_RTL8822B = n -CONFIG_RTL8723D = n -CONFIG_RTL8821C = n ######################### Interface ########################### CONFIG_USB_HCI = y CONFIG_PCI_HCI = n @@ -275,126 +265,6 @@ _PLATFORM_FILES := platform/platform_ops.o EXTRA_CFLAGS += -I$(src)/hal/btc include $(TopDIR)/hal/phydm/phydm.mk -########### HAL_RTL8188E ################################# -ifeq ($(CONFIG_RTL8188E), y) - -RTL871X = rtl8188e -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8189es -endif - -ifeq ($(CONFIG_GSPI_HCI), y) -MODULE_NAME = 8189es -endif - -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8188eu -endif - -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8188ee -endif -EXTRA_CFLAGS += -DCONFIG_RTL8188E - -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8188EPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_xmit.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o - -_HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ - hal/$(RTL871X)/$(RTL871X)_phycfg.o \ - hal/$(RTL871X)/$(RTL871X)_rf6052.o \ - hal/$(RTL871X)/$(RTL871X)_dm.o \ - hal/$(RTL871X)/$(RTL871X)_rxdesc.o \ - hal/$(RTL871X)/$(RTL871X)_cmd.o \ - hal/$(RTL871X)/hal8188e_s_fw.o \ - hal/$(RTL871X)/hal8188e_t_fw.o \ - hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_halinit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_led.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_xmit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_recv.o - -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -else -ifeq ($(CONFIG_GSPI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -else -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -endif -endif - -ifeq ($(CONFIG_USB_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188E_USB.o -endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188E_PCIE.o -endif -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188E_SDIO.o -endif - -endif - -########### HAL_RTL8192E ################################# -ifeq ($(CONFIG_RTL8192E), y) - -RTL871X = rtl8192e -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8192es -endif - -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8192eu -endif - -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8192ee -endif -EXTRA_CFLAGS += -DCONFIG_RTL8192E -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8192EPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_xmit.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o - -_HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ - hal/$(RTL871X)/$(RTL871X)_phycfg.o \ - hal/$(RTL871X)/$(RTL871X)_rf6052.o \ - hal/$(RTL871X)/$(RTL871X)_dm.o \ - hal/$(RTL871X)/$(RTL871X)_rxdesc.o \ - hal/$(RTL871X)/$(RTL871X)_cmd.o \ - hal/$(RTL871X)/hal8192e_fw.o \ - hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_halinit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_led.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_xmit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_recv.o - -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -else -ifeq ($(CONFIG_GSPI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -else -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -endif -endif - -ifeq ($(CONFIG_USB_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8192E_USB.o -endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8192E_PCIE.o -endif -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8192E_SDIO.o -endif - -ifeq ($(CONFIG_BT_COEXIST), y) -_BTC_FILES += hal/btc/halbtc8192e1ant.o \ - hal/btc/halbtc8192e2ant.o -endif - -endif ########### HAL_RTL8812A_RTL8821A ################################# @@ -503,64 +373,6 @@ endif endif -########### HAL_RTL8723B ################################# -ifeq ($(CONFIG_RTL8723B), y) - -RTL871X = rtl8723b -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8723bu -endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8723be -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8723bs -endif - -EXTRA_CFLAGS += -DCONFIG_RTL8723B - -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8723BPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o - -_HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ - hal/$(RTL871X)/$(RTL871X)_phycfg.o \ - hal/$(RTL871X)/$(RTL871X)_rf6052.o \ - hal/$(RTL871X)/$(RTL871X)_dm.o \ - hal/$(RTL871X)/$(RTL871X)_rxdesc.o \ - hal/$(RTL871X)/$(RTL871X)_cmd.o \ - hal/$(RTL871X)/hal8723b_fw.o - -_HAL_INTFS_FILES += \ - hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_halinit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_led.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_xmit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_recv.o - -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -else -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -endif - -ifeq ($(CONFIG_USB_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723B_USB.o -endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723B_PCIE.o -endif -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723B_SDIO.o -endif - -_BTC_FILES += hal/btc/halbtc8723bwifionly.o -ifeq ($(CONFIG_BT_COEXIST), y) -_BTC_FILES += hal/btc/halbtc8723b1ant.o \ - hal/btc/halbtc8723b2ant.o -endif - -endif - ########### HAL_RTL8814A ################################# ifeq ($(CONFIG_RTL8814A), y) ## ADD NEW VHT MP HW TX MODE ## @@ -619,223 +431,6 @@ endif endif -########### HAL_RTL8723C ################################# -ifeq ($(CONFIG_RTL8723C), y) - -RTL871X = rtl8703b -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8723cu -MODULE_SUB_NAME = 8703bu -endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8723ce -MODULE_SUB_NAME = 8703be -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8723cs -MODULE_SUB_NAME = 8703bs -endif - -EXTRA_CFLAGS += -DCONFIG_RTL8703B - -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8703BPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o - -_HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ - hal/$(RTL871X)/$(RTL871X)_phycfg.o \ - hal/$(RTL871X)/$(RTL871X)_rf6052.o \ - hal/$(RTL871X)/$(RTL871X)_dm.o \ - hal/$(RTL871X)/$(RTL871X)_rxdesc.o \ - hal/$(RTL871X)/$(RTL871X)_cmd.o \ - hal/$(RTL871X)/hal8703b_fw.o - -_HAL_INTFS_FILES += \ - hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_halinit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_led.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_xmit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_recv.o - -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -else -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -endif - -ifeq ($(CONFIG_USB_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8703B_USB.o -endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8703B_PCIE.o -endif - -ifeq ($(CONFIG_BT_COEXIST), y) -_BTC_FILES += hal/btc/halbtc8703b1ant.o -endif - -endif - -########### HAL_RTL8723D ################################# -ifeq ($(CONFIG_RTL8723D), y) - -RTL871X = rtl8723d -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8723du -MODULE_SUB_NAME = 8723du -endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8723de -MODULE_SUB_NAME = 8723de -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8723ds -MODULE_SUB_NAME = 8723ds -endif - -EXTRA_CFLAGS += -DCONFIG_RTL8723D - -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8723DPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o - -_HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ - hal/$(RTL871X)/$(RTL871X)_phycfg.o \ - hal/$(RTL871X)/$(RTL871X)_rf6052.o \ - hal/$(RTL871X)/$(RTL871X)_dm.o \ - hal/$(RTL871X)/$(RTL871X)_rxdesc.o \ - hal/$(RTL871X)/$(RTL871X)_cmd.o \ - hal/$(RTL871X)/hal8723d_fw.o \ - hal/$(RTL871X)/$(RTL871X)_lps_poff.o - - -_HAL_INTFS_FILES += \ - hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_halinit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_led.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_xmit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_SUB_NAME)_recv.o - -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -else -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -endif - -ifeq ($(CONFIG_USB_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723D_USB.o -endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8723D_PCIE.o -endif - -ifeq ($(CONFIG_BT_COEXIST), y) -_BTC_FILES += hal/btc/halbtc8723d1ant.o \ - hal/btc/halbtc8723d2ant.o -endif - -endif - -########### HAL_RTL8188F ################################# -ifeq ($(CONFIG_RTL8188F), y) - -RTL871X = rtl8188f -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8188fu -endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8188fe -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8189fs -endif - -EXTRA_CFLAGS += -DCONFIG_RTL8188F - -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8188FPwrSeq.o\ - hal/$(RTL871X)/$(RTL871X)_sreset.o - -_HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ - hal/$(RTL871X)/$(RTL871X)_phycfg.o \ - hal/$(RTL871X)/$(RTL871X)_rf6052.o \ - hal/$(RTL871X)/$(RTL871X)_dm.o \ - hal/$(RTL871X)/$(RTL871X)_rxdesc.o \ - hal/$(RTL871X)/$(RTL871X)_cmd.o \ - hal/$(RTL871X)/hal8188f_fw.o - -_HAL_INTFS_FILES += \ - hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_halinit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_led.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_xmit.o \ - hal/$(RTL871X)/$(HCI_NAME)/rtl$(MODULE_NAME)_recv.o - -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o -else -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o -endif - -ifeq ($(CONFIG_USB_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188F_USB.o -endif - -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188F_SDIO.o -endif - -endif - -########### HAL_RTL8822B ################################# -ifeq ($(CONFIG_RTL8822B), y) -RTL871X := rtl8822b -ifeq ($(CONFIG_USB_HCI), y) -ifeq ($(CONFIG_BT_COEXIST), n) -MODULE_NAME = 8812bu -else -MODULE_NAME = 88x2bu -endif -endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 88x2be -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 88x2bs -endif - -endif -########### HAL_RTL8821C ################################# -ifeq ($(CONFIG_RTL8821C), y) -RTL871X := rtl8821c -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8821cu -endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8821ce -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8821cs -endif - -endif -########### AUTO_CFG ################################# - -ifeq ($(CONFIG_AUTOCFG_CP), y) - -ifeq ($(CONFIG_MULTIDRV), y) -$(shell cp $(TopDIR)/autoconf_multidrv_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h) -else -ifeq ($(CONFIG_RTL8188E)$(CONFIG_SDIO_HCI),yy) -$(shell cp $(TopDIR)/autoconf_rtl8189e_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h) -else ifeq ($(CONFIG_RTL8188F)$(CONFIG_SDIO_HCI),yy) -$(shell cp $(TopDIR)/autoconf_rtl8189f_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h) -else ifeq ($(CONFIG_RTL8723C),y) -$(shell cp $(TopDIR)/autoconf_rtl8723c_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h) -else -$(shell cp $(TopDIR)/autoconf_$(RTL871X)_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h) -endif -endif - -endif - ########### END OF PATH ################################# ifeq ($(CONFIG_USB_HCI), y) @@ -1728,9 +1323,6 @@ endif EXTRA_CFLAGS += -DCONFIG_PLATFORM_SPRD EXTRA_CFLAGS += -DPLATFORM_SPREADTRUM_6820 EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -ifeq ($(RTL871X), rtl8188e) -EXTRA_CFLAGS += -DSOFTAP_PS_DURATION=50 -endif ifeq ($(CONFIG_SDIO_HCI), y) EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS _PLATFORM_FILES += platform/platform_sprd_sdio.o @@ -1744,9 +1336,6 @@ endif EXTRA_CFLAGS += -DCONFIG_PLATFORM_SPRD EXTRA_CFLAGS += -DPLATFORM_SPREADTRUM_8810 EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -ifeq ($(RTL871X), rtl8188e) -EXTRA_CFLAGS += -DSOFTAP_PS_DURATION=50 -endif ifeq ($(CONFIG_SDIO_HCI), y) EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS _PLATFORM_FILES += platform/platform_sprd_sdio.o @@ -1973,16 +1562,6 @@ ifneq ($(KERNELRELEASE),) ########### this part for *.mk ############################ include $(src)/hal/phydm/phydm.mk -########### HAL_RTL8822B ################################# -ifeq ($(CONFIG_RTL8822B), y) -include $(src)/rtl8822b.mk -endif - -########### HAL_RTL8821C ################################# -ifeq ($(CONFIG_RTL8821C), y) -include $(src)/rtl8821c.mk -endif - rtk_core := core/rtw_cmd.o \ core/rtw_security.o \ core/rtw_debug.o \