From a3246e708ed8987764d659fd638f80c5cd765877 Mon Sep 17 00:00:00 2001 From: kimocoder Date: Mon, 11 Nov 2019 15:56:22 +0100 Subject: [PATCH] Fix for RPI Raspian compilation --- Kconfig | 4 +-- Makefile | 103 +++++-------------------------------------------------- 2 files changed, 10 insertions(+), 97 deletions(-) diff --git a/Kconfig b/Kconfig index 957b6ff..f63a780 100644 --- a/Kconfig +++ b/Kconfig @@ -1,6 +1,6 @@ config 88XXAU - tristate "Realtek 88XXAU USB WiFi" + tristate "Realtek 88XXau USB WiFi" depends on USB ---help--- - Help message of 88XXAU + Help message of 88XXau diff --git a/Makefile b/Makefile index 9fff705..bc1b7ee 100755 --- a/Makefile +++ b/Makefile @@ -173,29 +173,16 @@ 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 -endif - ifeq ($(CONFIG_USB_HCI), y) HCI_NAME = usb endif -ifeq ($(CONFIG_PCI_HCI), y) -HCI_NAME = pci -endif - ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y) -EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau\" +EXTRA_CFLAGS += -DDRV_NAME=\"rtl88XXau\" ifeq ($(CONFIG_USB_HCI), y) USER_MODULE_NAME = 88XXau endif - else EXTRA_CFLAGS += -DDRV_NAME=\"rtl8812au\" endif @@ -219,17 +206,6 @@ 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 \ @@ -308,67 +284,6 @@ 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 ################################# @@ -462,7 +377,7 @@ endif EXTRA_CFLAGS += -DCONFIG_RTL8821A _HAL_INTFS_FILES += hal/rtl8812a/hal8821a_fw.o - + endif ifeq ($(CONFIG_BT_COEXIST), y) @@ -1206,9 +1121,12 @@ 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 ## 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 @@ -1280,7 +1198,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 @@ -1497,8 +1414,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 @@ -2067,7 +1982,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 @@ -2162,7 +2077,6 @@ ifeq ($(CONFIG_PCI_HCI), y) MODULE_NAME := rtw_pci endif - endif USER_MODULE_NAME ?= @@ -2219,7 +2133,7 @@ rtk_core := core/rtw_cmd.o \ core/rtw_odm.o \ core/rtw_rm.o \ core/rtw_rm_fsm.o \ - core/efuse/rtw_efuse.o + core/efuse/rtw_efuse.o ifeq ($(CONFIG_SDIO_HCI), y) rtk_core += core/rtw_sdio.o @@ -2322,4 +2236,3 @@ clean: rm -fr *.mod.c *.mod *.o .*.cmd *.ko *~ rm -fr .tmp_versions endif -