From d78ea696be14bd047966ee1fdeb2a1d529766307 Mon Sep 17 00:00:00 2001 From: kimocoder Date: Wed, 30 Oct 2019 23:29:20 +0000 Subject: [PATCH] Fix new version + add our custom Makefile --- Makefile | 899 +++++++----------------------------------------- dkms-install.sh | 2 +- dkms-remove.sh | 2 +- dkms.conf | 2 +- 4 files changed, 127 insertions(+), 778 deletions(-) mode change 100755 => 100644 Makefile diff --git a/Makefile b/Makefile old mode 100755 new mode 100644 index da8596d..eb1da4f --- a/Makefile +++ b/Makefile @@ -1,55 +1,38 @@ -EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) +EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) -fno-pie EXTRA_CFLAGS += -O1 #EXTRA_CFLAGS += -O3 -#EXTRA_CFLAGS += -Wall +EXTRA_CFLAGS += -Wall -Wno-switch -Wno-date-time -Wno-unused-value -Wno-unused-label +EXTRA_CFLAGS += -Wno-cast-function-type -Wno-unused-variable -Wno-unused -Wno-unused-parameter +EXTRA_CFLAGS += -Wno-unused-function -Wno-cast-function-type -Wno-misleading-indentation +EXTRA_CFLAGS += -Wno-uninitialized -Wno-missing-field-initializers -Wno-vla -g #EXTRA_CFLAGS += -Wextra #EXTRA_CFLAGS += -Werror #EXTRA_CFLAGS += -pedantic #EXTRA_CFLAGS += -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes +#EXTRA_CFLAGS += -Wno-tautological-compare +#EXTRA_CFLAGS += -Wno-incompatible-pointer-types +#EXTRA_CFLAGS += -Wsign-conversion +# Relax some warnings from '-Wextra' so we won't get flooded with warnings +#EXTRA_CFLAGS += -Wno-sign-compare -Wno-sign-conversion +#EXTRA_CFLAGS += -Wno-type-limits -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 += -I$(src)/include +#EXTRA_LDFLAGS += --strip-debug 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 endif -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 = n -CONFIG_RTL8192E = n -CONFIG_RTL8723B = n -CONFIG_RTL8814A = n -CONFIG_RTL8723C = n -CONFIG_RTL8188F = n -CONFIG_RTL8188GTV = n -CONFIG_RTL8822B = n -CONFIG_RTL8723D = n -CONFIG_RTL8821C = n -CONFIG_RTL8710B = n -CONFIG_RTL8192F = n +CONFIG_RTL8821A = y +CONFIG_RTL8814A = y ######################### Interface ########################### CONFIG_USB_HCI = y -CONFIG_PCI_HCI = n -CONFIG_SDIO_HCI = n -CONFIG_GSPI_HCI = n ########################## Features ########################### CONFIG_MP_INCLUDED = y -CONFIG_POWER_SAVING = y +CONFIG_POWER_SAVING = n CONFIG_USB_AUTOSUSPEND = n CONFIG_HW_PWRP_DETECTION = n CONFIG_BT_COEXIST = n @@ -58,20 +41,25 @@ CONFIG_WAPI_SUPPORT = n CONFIG_EFUSE_CONFIG_FILE = y CONFIG_EXT_CLK = n CONFIG_TRAFFIC_PROTECT = n -CONFIG_LOAD_PHY_PARA_FROM_FILE = y CONFIG_TXPWR_BY_RATE = y CONFIG_TXPWR_BY_RATE_EN = n CONFIG_TXPWR_LIMIT = y CONFIG_TXPWR_LIMIT_EN = n +CONFIG_CALIBRATE_TX_POWER_TO_MAX = y CONFIG_RTW_CHPLAN = 0xFF CONFIG_RTW_ADAPTIVITY_EN = disable CONFIG_RTW_ADAPTIVITY_MODE = normal CONFIG_SIGNAL_SCALE_MAPPING = n -CONFIG_80211W = y +CONFIG_80211W = n CONFIG_REDUCE_TX_CPU_LOADING = n CONFIG_BR_EXT = y CONFIG_TDLS = n -CONFIG_WIFI_MONITOR = n +CONFIG_AP_MODE = n +CONFIG_WIFI_MONITOR = y +CONFIG_NET_NS = y +# If you are setting up AP (e.g. by hostapd) in 802.11ac mode, you may have to choose 'y' below. +# Otherwise some channels may be flagged 'NO-IR' (i.e. Passive scanning) by the driver. +CONFIG_DISABLE_REGD_C=y CONFIG_MCC_MODE = n CONFIG_APPEND_VENDOR_IE_ENABLE = n CONFIG_RTW_NAPI = y @@ -84,10 +72,12 @@ CONFIG_RTW_WIFI_HAL = n CONFIG_ICMP_VOQ = n CONFIG_IP_R_MONITOR = n #arp VOQ and high rate ########################## Debug ########################### -CONFIG_RTW_DEBUG = y -# default log level is _DRV_INFO_ = 4, -# please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. -CONFIG_RTW_LOG_LEVEL = 4 +CONFIG_RTW_DEBUG = n +CONFIG_RTW_LOG_LEVEL = 3 +CONFIG_USB_DEBUG = n +#DEBUG=1 +######################### Enable Country Set ############### +CONFIG_RTW_IOCTL_SET_COUNTRY = y ######################## Wake On Lan ########################## CONFIG_WOWLAN = n #bit2: deauth, bit1: unicast, bit0: magic pkt. @@ -104,10 +94,10 @@ CONFIG_HIGH_ACTIVE_HST2DEV = n CONFIG_PNO_SUPPORT = n CONFIG_PNO_SET_DEBUG = n CONFIG_AP_WOWLAN = n -######### Notify SDIO Host Keep Power During Syspend ########## +######### Notify SDIO Host Keep Power During Suspend ########## CONFIG_RTW_SDIO_PM_KEEP_POWER = y ###################### MP HW TX MODE FOR VHT ####################### -CONFIG_MP_VHT_HW_TX_MODE = n +CONFIG_MP_VHT_HW_TX_MODE = y ###################### Platform Related ####################### CONFIG_PLATFORM_I386_PC = y CONFIG_PLATFORM_ANDROID_X86 = n @@ -119,6 +109,7 @@ CONFIG_PLATFORM_ARM_S3C6K4 = n CONFIG_PLATFORM_MIPS_RMI = n CONFIG_PLATFORM_RTD2880B = n CONFIG_PLATFORM_MIPS_AR9132 = n +CONFIG_PLATFORM_OPENWRT_NEO2 = n CONFIG_PLATFORM_RTK_DMP = n CONFIG_PLATFORM_MIPS_PLM = n CONFIG_PLATFORM_MSTAR389 = n @@ -156,6 +147,8 @@ CONFIG_PLATFORM_ARM_LGE = n CONFIG_PLATFORM_ARM_SPREADTRUM_6820 = n CONFIG_PLATFORM_ARM_SPREADTRUM_8810 = n CONFIG_PLATFORM_ARM_WMT = n +CONFIG_PLATFORM_ARM_RPI = n +CONFIG_PLATFORM_ARM64_RPI = n CONFIG_PLATFORM_TI_DM365 = n CONFIG_PLATFORM_MOZART = n CONFIG_PLATFORM_RTK119X = n @@ -170,30 +163,32 @@ CONFIG_PLATFORM_NV_TK1_UBUNTU = n CONFIG_PLATFORM_RTL8197D = n CONFIG_PLATFORM_AML_S905 = n CONFIG_PLATFORM_ZTE_ZX296716 = n +CONFIG_PLATFORM_ARM_NV_NANO = n + ########### CUSTOMER ################################ CONFIG_CUSTOMER_HUAWEI_GENERAL = n - CONFIG_DRVEXT_MODULE = n - export TopDIR ?= $(shell pwd) ########### COMMON ################################# -ifeq ($(CONFIG_GSPI_HCI), y) -HCI_NAME = gspi -endif - -ifeq ($(CONFIG_SDIO_HCI), y) -HCI_NAME = sdio +ifeq ($(CONFIG_DISABLE_REGD_C), y) +EXTRA_CFLAGS += -DCONFIG_DISABLE_REGD_C endif ifeq ($(CONFIG_USB_HCI), y) HCI_NAME = usb endif -ifeq ($(CONFIG_PCI_HCI), y) -HCI_NAME = pci +ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y) + +EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau\" +ifeq ($(CONFIG_USB_HCI), y) +USER_MODULE_NAME = 88XXau endif +else +EXTRA_CFLAGS += -DDRV_NAME=\"rtl8812au\" +endif _OS_INTFS_FILES := os_dep/osdep_service.o \ os_dep/linux/os_intfs.o \ @@ -207,24 +202,12 @@ _OS_INTFS_FILES := os_dep/osdep_service.o \ os_dep/linux/rtw_cfgvendor.o \ os_dep/linux/wifi_regd.o \ os_dep/linux/rtw_android.o \ - os_dep/linux/rtw_proc.o \ os_dep/linux/rtw_rhashtable.o ifeq ($(CONFIG_MP_INCLUDED), y) _OS_INTFS_FILES += os_dep/linux/ioctl_mp.o endif -ifeq ($(CONFIG_SDIO_HCI), y) -_OS_INTFS_FILES += os_dep/linux/custom_gpio_linux.o -_OS_INTFS_FILES += os_dep/linux/$(HCI_NAME)_ops_linux.o -endif - -ifeq ($(CONFIG_GSPI_HCI), y) -_OS_INTFS_FILES += os_dep/linux/custom_gpio_linux.o -_OS_INTFS_FILES += os_dep/linux/$(HCI_NAME)_ops_linux.o -endif - - _HAL_INTFS_FILES := hal/hal_intf.o \ hal/hal_com.o \ hal/hal_com_phycfg.o \ @@ -239,147 +222,16 @@ _HAL_INTFS_FILES := hal/hal_intf.o \ hal/led/hal_led.o \ hal/led/hal_$(HCI_NAME)_led.o - EXTRA_CFLAGS += -I$(src)/platform -_PLATFORM_FILES := platform/platform_ops.o - EXTRA_CFLAGS += -I$(src)/hal/btc -########### 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 ################################# - ifneq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A), n_n) RTL871X = rtl8812a ifeq ($(CONFIG_USB_HCI), y) MODULE_NAME = 8812au endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8812ae -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8812as -endif _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ hal/$(RTL871X)/Hal8812PwrSeq.o \ @@ -398,34 +250,20 @@ _HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.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 + +ifeq ($(CONFIG_USB_HCI), y) _HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o endif -endif ifeq ($(CONFIG_RTL8812A), y) ifeq ($(CONFIG_USB_HCI), y) _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8812A_USB.o endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8812A_PCIE.o -endif endif ifeq ($(CONFIG_RTL8821A), y) ifeq ($(CONFIG_USB_HCI), y) _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8821A_USB.o endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8821A_PCIE.o -endif -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8821A_SDIO.o -endif endif ifeq ($(CONFIG_RTL8812A), y) @@ -434,7 +272,6 @@ _HAL_INTFS_FILES += hal/rtl8812a/hal8812a_fw.o endif ifeq ($(CONFIG_RTL8821A), y) - ifeq ($(CONFIG_RTL8812A), n) RTL871X = rtl8821a @@ -445,19 +282,11 @@ else MODULE_NAME := 8811au endif endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME := 8821ae -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME := 8821as -endif - endif EXTRA_CFLAGS += -DCONFIG_RTL8821A _HAL_INTFS_FILES += hal/rtl8812a/hal8821a_fw.o - endif ifeq ($(CONFIG_BT_COEXIST), y) @@ -470,86 +299,20 @@ _BTC_FILES += hal/btc/halbtc8821a1ant.o \ hal/btc/halbtc8821a2ant.o endif 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 ## #EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE -#CONFIG_MP_VHT_HW_TX_MODE = y +CONFIG_MP_VHT_HW_TX_MODE = y ########################################## RTL871X = rtl8814a ifeq ($(CONFIG_USB_HCI), y) MODULE_NAME = 8814au endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8814ae -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8814as -endif EXTRA_CFLAGS += -DCONFIG_RTL8814A - _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ hal/$(RTL871X)/Hal8814PwrSeq.o \ hal/$(RTL871X)/$(RTL871X)_xmit.o\ @@ -563,392 +326,19 @@ _HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_hal_init.o \ hal/$(RTL871X)/$(RTL871X)_cmd.o \ hal/$(RTL871X)/hal8814a_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_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 +ifeq ($(CONFIG_USB_HCI), y) _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)/HalEfuseMask8814A_USB.o endif -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8814A_PCIE.o -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_RTL8188GTV ################################# -ifeq ($(CONFIG_RTL8188GTV), y) - -RTL871X = rtl8188gtv -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8188gtvu -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8189gtvs -endif - -EXTRA_CFLAGS += -DCONFIG_RTL8188GTV - -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8188GTVPwrSeq.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)/hal8188gtv_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)/HalEfuseMask8188GTV_USB.o -endif - -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188GTV_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 - -########### HAL_RTL8710B ################################# -ifeq ($(CONFIG_RTL8710B), y) - -RTL871X = rtl8710b -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8710bu -MODULE_SUB_NAME = 8710bu -endif - -EXTRA_CFLAGS += -DCONFIG_RTL8710B - -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8710BPwrSeq.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)/hal8710b_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 - -_HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops.o - -ifeq ($(CONFIG_USB_HCI), y) -_HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8710B_USB.o -endif - -endif - -########### HAL_RTL8192F ################################# -ifeq ($(CONFIG_RTL8192F), y) - -RTL871X = rtl8192f -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8192fu -MODULE_SUB_NAME = 8192fu -endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8192fe -MODULE_SUB_NAME = 8192fe -endif -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8192fs -MODULE_SUB_NAME = 8192fs -endif - -EXTRA_CFLAGS += -DCONFIG_RTL8192F - -_HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8192FPwrSeq.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)/hal8192f_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_SDIO_HCI), y) -_HAL_INTFS_FILES += hal/efuse/$(RTL871X)/HalEfuseMask8192F_SDIO.o -endif - -ifeq ($(CONFIG_USB_HCI), y) -_HAL_INTFS_FILES += hal/efuse/$(RTL871X)/HalEfuseMask8192F_USB.o -endif - -ifeq ($(CONFIG_PCI_HCI), y) -_HAL_INTFS_FILES += hal/efuse/$(RTL871X)/HalEfuseMask8192F_PCIE.o -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 ################################# @@ -984,7 +374,6 @@ ifeq ($(CONFIG_WAPI_SUPPORT), y) EXTRA_CFLAGS += -DCONFIG_WAPI_SUPPORT endif - ifeq ($(CONFIG_EFUSE_CONFIG_FILE), y) EXTRA_CFLAGS += -DCONFIG_EFUSE_CONFIG_FILE @@ -1007,7 +396,6 @@ EXTRA_CFLAGS += -DWIFIMAC_PATH=\"$(USER_WIFIMAC_PATH)\" else EXTRA_CFLAGS += -DWIFIMAC_PATH=\"/data/wifimac.txt\" endif - endif ifeq ($(CONFIG_EXT_CLK), y) @@ -1018,12 +406,6 @@ ifeq ($(CONFIG_TRAFFIC_PROTECT), y) EXTRA_CFLAGS += -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/\" -endif - ifeq ($(CONFIG_TXPWR_BY_RATE), n) EXTRA_CFLAGS += -DCONFIG_TXPWR_BY_RATE=0 else ifeq ($(CONFIG_TXPWR_BY_RATE), y) @@ -1145,7 +527,6 @@ EXTRA_CFLAGS += -DCONFIG_BR_EXT EXTRA_CFLAGS += '-DCONFIG_BR_EXT_BRNAME="'$(BR_NAME)'"' endif - ifeq ($(CONFIG_TDLS), y) EXTRA_CFLAGS += -DCONFIG_TDLS endif @@ -1193,6 +574,16 @@ ifeq ($(CONFIG_IP_R_MONITOR), y) EXTRA_CFLAGS += -DCONFIG_IP_R_MONITOR endif +ifeq ($(CONFIG_LED_CONTROL), y) +EXTRA_CFLAGS += -DCONFIG_LED_CONTROL +ifeq ($(RTL8814), 1) +EXTRA_CFLAGS += -DCONFIG_SW_LED -DCONFIG_RTW_SW_LED +endif +ifeq ($(CONFIG_LED_ENABLE), y) +EXTRA_CFLAGS += -DCONFIG_LED_ENABLE +endif +endif + ifeq ($(CONFIG_RTW_WIFI_HAL), y) #EXTRA_CFLAGS += -DCONFIG_RTW_WIFI_HAL_DEBUG EXTRA_CFLAGS += -DCONFIG_RTW_WIFI_HAL @@ -1207,9 +598,15 @@ EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE ifeq ($(CONFIG_PLATFORM_I386_PC), y) ## For I386 X86 ToolChain use Hardware FLOATING EXTRA_CFLAGS += -mhard-float +EXTRA_CFLAGS += -DMARK_KERNEL_PFU +else ifeq ($(CONFIG_PLATFORM_ARM_RPI), y) +## For Rpi3: use hardware floating, but not on the api +EXTRA_CFLAGS += -mfloat-abi=softfp else ## For ARM ToolChain use Hardware FLOATING -EXTRA_CFLAGS += -mfloat-abi=hard +# Raspbian kernel is with soft-float. +# 'softfp' allows FP instructions, but no FP on function call interfaces +EXTRA_CFLAGS += -mfloat-abi=softfp endif endif @@ -1222,12 +619,15 @@ EXTRA_CFLAGS += -DCONFIG_RTW_DEBUG EXTRA_CFLAGS += -DRTW_LOG_LEVEL=$(CONFIG_RTW_LOG_LEVEL) endif +ifeq ($(CONFIG_RTW_IOCTL_SET_COUNTRY), y) +EXTRA_CFLAGS += -DCONFIG_RTW_IOCTL_SET_COUNTRY +endif + EXTRA_CFLAGS += -DDM_ODM_SUPPORT_TYPE=0x04 ifeq ($(CONFIG_PLATFORM_I386_PC), y) -EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -SUBARCH := $(shell uname -m | sed -e s/i.86/i386/) +SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ | sed -e s/ppc64le/powerpc/ | sed -e s/aarch64/arm64/ | sed -e s/armv7l/arm/) ARCH ?= $(SUBARCH) CROSS_COMPILE ?= KVER := $(shell uname -r) @@ -1249,7 +649,6 @@ EXTRA_CFLAGS += -DCONFIG_RADIO_WORK EXTRA_CFLAGS += -DRTW_VENDOR_EXT_SUPPORT EXTRA_CFLAGS += -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- KSRC :=/mnt/newdisk/android_sdk/nvidia_tk1/android_L/out/target/product/shieldtablet/obj/KERNEL/ MODULE_NAME = wlan @@ -1259,9 +658,7 @@ 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 - ARCH ?= arm - CROSS_COMPILE ?= KVER := $(shell uname -r) KSRC := /lib/modules/$(KVER)/build @@ -1281,7 +678,6 @@ KSRC := $(KERNEL_BUILD_PATH) MODULE_NAME :=wlan endif - ifeq ($(CONFIG_PLATFORM_ACTIONS_ATM705X), y) EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN #EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC @@ -1295,7 +691,6 @@ EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ifeq ($(CONFIG_SDIO_HCI), y) EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS -_PLATFORM_FILES += platform/platform_arm_act_sdio.o endif ARCH := arm @@ -1318,10 +713,8 @@ EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ifeq ($(CONFIG_USB_HCI), y) EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX -_PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o endif ifeq ($(CONFIG_SDIO_HCI), y) -_PLATFORM_FILES += platform/platform_ARM_SUN50IW1P1_sdio.o endif ARCH := arm64 @@ -1450,11 +843,23 @@ endif ifeq ($(CONFIG_PLATFORM_MIPS_AR9132), y) EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN +EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ARCH := mips CROSS_COMPILE := mips-openwrt-linux- KSRC := /home/alex/test_openwrt/tmp/linux-2.6.30.9 endif +# This is how I built for openwrt Neo2 platform. --Ben +ifeq ($(CONFIG_PLATFORM_OPENWRT_NEO2), y) +EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +#EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +ARCH := arm64 +CROSS_COMPILE := aarch64-openwrt-linux- +#export PATH=$PATH:/home/greearb/git/openwrt-neo2-dev/staging_dir/toolchain-aarch64_cortex-a53_gcc-7.3.0_musl/bin/ +#export STAGING_DIR=/home/greearb/git/openwrt-neo2-dev/staging_dir +KSRC := /home/greearb/git/openwrt-neo2-dev/build_dir/target-aarch64_cortex-a53_musl/linux-sunxi_cortexa53/linux-4.14.78 +endif + ifeq ($(CONFIG_PLATFORM_DMP_PHILIPS), y) EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DRTK_DMP_PLATFORM ARCH := mips @@ -1467,7 +872,6 @@ ifeq ($(CONFIG_PLATFORM_RTK_DMP), y) EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DRTK_DMP_PLATFORM -DCONFIG_WIRELESS_EXT EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ifeq ($(CONFIG_USB_HCI), y) -_PLATFORM_FILES += platform/platform_RTK_DMP_usb.o endif ARCH:=mips CROSS_COMPILE:=mipsel-linux- @@ -1498,8 +902,6 @@ CROSS_COMPILE := /home/share/CusEnv/FreeScale/arm-eabi-4.4.3/bin/arm-eabi- KSRC ?= /home/share/CusEnv/FreeScale/FS_kernel_env endif - - ifeq ($(CONFIG_PLATFORM_ACTIONS_ATJ227X), y) EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ACTIONS_ATJ227X ARCH := mips @@ -1664,12 +1066,10 @@ EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ifeq ($(CONFIG_USB_HCI), y) EXTRA_CFLAGS += -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 -_PLATFORM_FILES += platform/platform_ARM_SUNxI_sdio.o endif ARCH := arm @@ -1688,16 +1088,13 @@ EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION - EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ifeq ($(CONFIG_USB_HCI), y) EXTRA_CFLAGS += -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 -_PLATFORM_FILES += platform/platform_ARM_SUNnI_sdio.o endif ARCH := arm @@ -1724,10 +1121,8 @@ EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ifeq ($(CONFIG_USB_HCI), y) EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX -_PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o endif ifeq ($(CONFIG_SDIO_HCI), y) -_PLATFORM_FILES += platform/platform_ARM_SUNnI_sdio.o endif ARCH := arm @@ -1754,10 +1149,8 @@ EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ifeq ($(CONFIG_USB_HCI), y) EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX -_PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o endif ifeq ($(CONFIG_SDIO_HCI), y) -_PLATFORM_FILES += platform/platform_ARM_SUNnI_sdio.o endif ARCH := arm @@ -1777,17 +1170,13 @@ EXTRA_CFLAGS += -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 - # Enable this for Android 5.0 EXTRA_CFLAGS += -DCONFIG_RADIO_WORK - EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ifeq ($(CONFIG_USB_HCI), y) EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX -_PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o endif ifeq ($(CONFIG_SDIO_HCI), y) -_PLATFORM_FILES += platform/platform_ARM_SUNnI_sdio.o endif ARCH := arm @@ -1885,14 +1274,6 @@ ifndef KSRC KSRC := /HiSTBAndroidV600R003C00SPC021_git_0512/device/hisilicon/bigfish/sdk/source/kernel/linux-3.18.y KSRC += O=/HiSTBAndroidV600R003C00SPC021_git_0512/out/target/product/Hi3798MV200/obj/KERNEL_OBJ endif - -ifeq ($(CONFIG_RTL8822B), y) -ifeq ($(CONFIG_SDIO_HCI), y) -CONFIG_RTL8822BS ?= m -USER_MODULE_NAME := rtl8822bs -endif -endif - endif # Platform setting @@ -1908,7 +1289,6 @@ EXTRA_CFLAGS += -DSOFTAP_PS_DURATION=50 endif ifeq ($(CONFIG_SDIO_HCI), y) EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS -_PLATFORM_FILES += platform/platform_sprd_sdio.o endif endif @@ -1924,7 +1304,6 @@ EXTRA_CFLAGS += -DSOFTAP_PS_DURATION=50 endif ifeq ($(CONFIG_SDIO_HCI), y) EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS -_PLATFORM_FILES += platform/platform_sprd_sdio.o endif endif @@ -1934,7 +1313,6 @@ EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ifeq ($(CONFIG_SDIO_HCI), y) -_PLATFORM_FILES += platform/platform_ARM_WMT_sdio.o endif ARCH := arm CROSS_COMPILE := /home/android_sdk/WonderMedia/wm8880-android4.4/toolchain/arm_201103_gcc4.5.2/mybin/arm_1103_le- @@ -1942,6 +1320,39 @@ KSRC := /home/android_sdk/WonderMedia/wm8880-android4.4/kernel4.4/ MODULE_NAME :=8189es_kk endif +ifeq ($(CONFIG_PLATFORM_ARM_NV_NANO), y) +EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +ARCH := arm64 +KVER := $(shell uname -r) +KSRC := /lib/modules/$(KVER)/build +MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/ +INSTALL_PREFIX := +STAGINGMODDIR := /lib/modules/$(KVER)/kernel/drivers/staging +endif + +ifeq ($(CONFIG_PLATFORM_ARM_RPI), y) +EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +ARCH ?= arm +CROSS_COMPILE ?= +KVER ?= $(shell uname -r) +KSRC := /lib/modules/$(KVER)/build +MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/ +INSTALL_PREFIX := +endif + +ifeq ($(CONFIG_PLATFORM_ARM64_RPI), y) +EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +ARCH ?= arm64 +CROSS_COMPILE ?= +KVER ?= $(shell uname -r) +KSRC := /lib/modules/$(KVER)/build +MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/ +INSTALL_PREFIX := +endif + ifeq ($(CONFIG_PLATFORM_RTK119X), y) EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN #EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN7I @@ -1958,11 +1369,9 @@ EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX #_PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o endif ifeq ($(CONFIG_SDIO_HCI), y) -_PLATFORM_FILES += platform/platform_ARM_SUNnI_sdio.o endif ARCH := arm - # ==== Cross compile setting for Android 4.4 SDK ===== #CROSS_COMPILE := arm-linux-gnueabihf- KVER := 3.10.24 @@ -1970,7 +1379,6 @@ KVER := 3.10.24 CROSS_COMPILE := /home/realtek/software_phoenix/phoenix/toolchain/usr/local/arm-2013.11/bin/arm-linux-gnueabihf- KSRC := /home/realtek/software_phoenix/linux-kernel MODULE_NAME := 8192eu - endif ifeq ($(CONFIG_PLATFORM_RTK119X_AM), y) @@ -1980,13 +1388,11 @@ EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE -DCONFIG_FULL_CH_IN_P2P_HANDSHAKE EXTRA_CFLAGS += -DCONFIG_IFACE_NUMBER=3 EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT - ifeq ($(CONFIG_USB_HCI), y) EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX endif ARCH := arm - #CROSS_COMPILE := arm-linux-gnueabihf- KVER := 3.10.24 #KSRC := @@ -2019,7 +1425,6 @@ EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX endif ARCH := arm64 - # ==== Cross compile setting for Android 4.4 SDK ===== #CROSS_COMPILE := arm-linux-gnueabihf- #KVER := 4.1.10 @@ -2039,10 +1444,8 @@ EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX endif ARCH:=rlx - CROSS_COMPILE:=mips-linux- KSRC:= /home/realtek/share/Develop/IPCAM_SDK/RealSil/rts3901_sdk_v1.2_vanilla/linux-3.10 - endif ifeq ($(CONFIG_PLATFORM_NOVATEK_NT72668), y) @@ -2068,7 +1471,7 @@ 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 MODULE_NAME := wlan -endif +endif ifeq ($(CONFIG_PLATFORM_RTL8197D), y) EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN -DCONFIG_PLATFORM_RTL8197D @@ -2087,10 +1490,8 @@ EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 EXTRA_CFLAGS += -DRTW_USE_CFG80211_STA_EVENT # default setting for Android 5.x and later EXTRA_CFLAGS += -DCONFIG_RADIO_WORK - ifeq ($(CONFIG_SDIO_HCI), y) EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS -_PLATFORM_FILES += platform/platform_aml_s905_sdio.o endif ARCH ?= arm64 @@ -2107,7 +1508,6 @@ CONFIG_RTL8822BS ?= m USER_MODULE_NAME := 8822bs endif endif - endif ifeq ($(CONFIG_PLATFORM_ZTE_ZX296716), y) @@ -2130,14 +1530,6 @@ endif ARCH ?= arm64 CROSS_COMPILE ?= KSRC ?= - -ifeq ($(CONFIG_RTL8822B), y) -ifeq ($(CONFIG_SDIO_HCI), y) -CONFIG_RTL8822BS ?= m -USER_MODULE_NAME := 8822bs -endif -endif - endif ########### CUSTOMER ################################ @@ -2149,23 +1541,6 @@ ifeq ($(CONFIG_CUSTOMER_HUAWEI), y) EXTRA_CFLAGS += -DCONFIG_HUAWEI_PROC endif -ifeq ($(CONFIG_MULTIDRV), y) - -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME := rtw_sdio -endif - -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME := rtw_usb -endif - -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME := rtw_pci -endif - - -endif - USER_MODULE_NAME ?= ifneq ($(USER_MODULE_NAME),) MODULE_NAME := $(USER_MODULE_NAME) @@ -2176,16 +1551,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 \ @@ -2220,16 +1585,10 @@ rtk_core := core/rtw_cmd.o \ core/rtw_odm.o \ core/rtw_rm.o \ core/rtw_rm_fsm.o \ - core/efuse/rtw_efuse.o - -ifeq ($(CONFIG_SDIO_HCI), y) -rtk_core += core/rtw_sdio.o -endif + core/efuse/rtw_efuse.o $(MODULE_NAME)-y += $(rtk_core) - $(MODULE_NAME)-$(CONFIG_INTEL_WIDI) += core/rtw_intel_widi.o - $(MODULE_NAME)-$(CONFIG_WAPI_SUPPORT) += core/rtw_wapi.o \ core/rtw_wapi_sms4.o @@ -2237,18 +1596,10 @@ $(MODULE_NAME)-y += $(_OS_INTFS_FILES) $(MODULE_NAME)-y += $(_HAL_INTFS_FILES) $(MODULE_NAME)-y += $(_PHYDM_FILES) $(MODULE_NAME)-y += $(_BTC_FILES) -$(MODULE_NAME)-y += $(_PLATFORM_FILES) - $(MODULE_NAME)-$(CONFIG_MP_INCLUDED) += core/rtw_mp.o -ifeq ($(CONFIG_RTL8723B), y) -$(MODULE_NAME)-$(CONFIG_MP_INCLUDED)+= core/rtw_bt_mp.o -endif - obj-$(CONFIG_RTL8812AU) := $(MODULE_NAME).o - else - export CONFIG_RTL8812AU = m all: modules @@ -2264,11 +1615,11 @@ install: /sbin/depmod -a ${KVER} uninstall: - rm -f $(MODDESTDIR)/$(MODULE_NAME).ko + rm -f $(MODDESTDIR)$(MODULE_NAME).ko /sbin/depmod -a ${KVER} -backup_rtlwifi: - @echo "Making backup rtlwifi drivers" +backup: + @echo "Making backup of drivers" ifneq (,$(wildcard $(STAGINGMODDIR)/rtl*)) @tar cPf $(wildcard $(STAGINGMODDIR))/backup_rtlwifi_driver.tar $(wildcard $(STAGINGMODDIR)/rtl*) @rm -rf $(wildcard $(STAGINGMODDIR)/rtl*) @@ -2284,7 +1635,7 @@ endif @/sbin/depmod -a ${KVER} @echo "Please reboot your system" -restore_rtlwifi: +restore: @echo "Restoring backups" ifneq (,$(wildcard $(STAGINGMODDIR)/backup_rtlwifi_driver.tar)) @tar xPf $(STAGINGMODDIR)/backup_rtlwifi_driver.tar @@ -2305,7 +1656,6 @@ config_r: @echo "make config" /bin/bash script/Configure script/config.in - .PHONY: modules clean clean: @@ -2323,4 +1673,3 @@ clean: rm -fr *.mod.c *.mod *.o .*.cmd *.ko *~ rm -fr .tmp_versions endif - diff --git a/dkms-install.sh b/dkms-install.sh index 7cf2e95..a8e58cf 100755 --- a/dkms-install.sh +++ b/dkms-install.sh @@ -9,7 +9,7 @@ fi DRV_DIR="$(pwd)" DRV_NAME=rtl8812au -DRV_VERSION=5.6.4.1 +DRV_VERSION=5.6.4.2 cp -r ${DRV_DIR} /usr/src/${DRV_NAME}-${DRV_VERSION} diff --git a/dkms-remove.sh b/dkms-remove.sh index 8f1d53e..6a8d6d6 100755 --- a/dkms-remove.sh +++ b/dkms-remove.sh @@ -9,7 +9,7 @@ fi DRV_DIR="$(pwd)" DRV_NAME=rtl8812au -DRV_VERSION=5.6.4.1 +DRV_VERSION=5.6.4.2 dkms remove ${DRV_NAME}/${DRV_VERSION} --all rm -rf /usr/src/${DRV_NAME}-${DRV_VERSION} diff --git a/dkms.conf b/dkms.conf index 4120051..4d31175 100644 --- a/dkms.conf +++ b/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="realtek-rtl88xxau" -PACKAGE_VERSION="5.6.4.1~20191030" +PACKAGE_VERSION="5.6.4.2~20191030" CLEAN="'make' clean" BUILT_MODULE_NAME[0]=88XXau PROCS_NUM=`nproc`