From 03280f73bdf4f963953e3d5e4abf43b6447382ba Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 9 May 2013 16:10:39 -0500 Subject: [PATCH] Cleanup Makefile Signed-off-by: Larry Finger --- Makefile | 218 ++++--------------------------------------------------- 1 file changed, 14 insertions(+), 204 deletions(-) mode change 100755 => 100644 Makefile diff --git a/Makefile b/Makefile old mode 100755 new mode 100644 index db9db3d..3d55337 --- a/Makefile +++ b/Makefile @@ -1,11 +1,5 @@ EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) EXTRA_CFLAGS += -O1 -#EXTRA_CFLAGS += -O3 -#EXTRA_CFLAGS += -Wall -#EXTRA_CFLAGS += -Wextra -#EXTRA_CFLAGS += -Werror -#EXTRA_CFLAGS += -pedantic -#EXTRA_CFLAGS += -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes EXTRA_CFLAGS += -Wno-unused-variable EXTRA_CFLAGS += -Wno-unused-value @@ -20,15 +14,9 @@ EXTRA_CFLAGS += -I$(src)/include CONFIG_AUTOCFG_CP = n -CONFIG_RTL8192C = n -CONFIG_RTL8192D = n -CONFIG_RTL8723A = n CONFIG_RTL8188E = y CONFIG_USB_HCI = y -CONFIG_PCI_HCI = n -CONFIG_SDIO_HCI = n -CONFIG_GSPI_HCI = n CONFIG_MP_INCLUDED = y CONFIG_POWER_SAVING = y @@ -45,34 +33,6 @@ CONFIG_FTP_PROTECT = n CONFIG_WOWLAN = n CONFIG_PLATFORM_I386_PC = y -CONFIG_PLATFORM_ANDROID_X86 = n -CONFIG_PLATFORM_ARM_S3C2K4 = n -CONFIG_PLATFORM_ARM_PXA2XX = n -CONFIG_PLATFORM_ARM_S3C6K4 = n -CONFIG_PLATFORM_MIPS_RMI = n -CONFIG_PLATFORM_RTD2880B = n -CONFIG_PLATFORM_MIPS_AR9132 = n -CONFIG_PLATFORM_RTK_DMP = n -CONFIG_PLATFORM_MIPS_PLM = n -CONFIG_PLATFORM_MSTAR389 = n -CONFIG_PLATFORM_MT53XX = n -CONFIG_PLATFORM_ARM_MX51_241H = n -CONFIG_PLATFORM_ACTIONS_ATJ227X = n -CONFIG_PLATFORM_TEGRA3_CARDHU = n -CONFIG_PLATFORM_TEGRA4_DALMORE = n -CONFIG_PLATFORM_ARM_TCC8900 = n -CONFIG_PLATFORM_ARM_TCC8920 = n -CONFIG_PLATFORM_ARM_RK2818 = n -CONFIG_PLATFORM_ARM_URBETTER = n -CONFIG_PLATFORM_ARM_TI_PANDA = n -CONFIG_PLATFORM_MIPS_JZ4760 = n -CONFIG_PLATFORM_DMP_PHILIPS = n -CONFIG_PLATFORM_TI_DM365 = n -CONFIG_PLATFORM_MSTAR_TITANIA12 = n -CONFIG_PLATFORM_SZEBOOK = n -CONFIG_PLATFORM_ARM_SUNxI = n -CONFIG_PLATFORM_ACTIONS_ATM702X = n -CONFIG_PLATFORM_MN10300 = n CONFIG_DRVEXT_MODULE = n @@ -85,124 +45,14 @@ OUTSRC_FILES := hal/odm_debug.o \ hal/odm.o\ hal/HalPhyRf.o -ifeq ($(CONFIG_RTL8192C), y) -RTL871X = rtl8192c - -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8192cu -OUTSRC_FILES += hal/Hal8192CUFWImg_CE.o \ - hal/Hal8192CUPHYImg_CE.o \ - hal/Hal8192CUMACImg_CE.o -endif - -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8192ce -OUTSRC_FILES += hal/Hal8192CEFWImg_CE.o \ - hal/Hal8192CEPHYImg_CE.o \ - hal/Hal8192CEMACImg_CE.o -endif - -OUTSRC_FILES += hal/odm_RTL8192C.o\ - hal/HalDMOutSrc8192C_CE.o - -CHIP_FILES := \ - hal/$(RTL871X)_sreset.o \ - hal/$(RTL871X)_xmit.o -CHIP_FILES += $(OUTSRC_FILES) - -endif - -ifeq ($(CONFIG_RTL8192D), y) -RTL871X = rtl8192d - -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8192du -OUTSRC_FILES += hal/Hal8192DUFWImg_CE.o \ - hal/Hal8192DUPHYImg_CE.o \ - hal/Hal8192DUMACImg_CE.o -endif - -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8192de -OUTSRC_FILES += hal/Hal8192DEFWImg_CE.o \ - hal/Hal8192DEPHYImg_CE.o \ - hal/Hal8192DEMACImg_CE.o -endif - -OUTSRC_FILES += hal/odm_RTL8192D.o\ - hal/HalDMOutSrc8192D_CE.o -CHIP_FILES := \ - hal/$(RTL871X)_xmit.o -CHIP_FILES += $(OUTSRC_FILES) -endif - -ifeq ($(CONFIG_RTL8723A), y) - -RTL871X = rtl8723a - -HAL_COMM_FILES := hal/$(RTL871X)/$(RTL871X)_xmit.o \ - hal/$(RTL871X)/$(RTL871X)_sreset.o - -ifeq ($(CONFIG_GSPI_HCI), y) -MODULE_NAME = 8723as -OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/Hal8723SHWImg_CE.o -endif - -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8723as -OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/Hal8723SHWImg_CE.o -endif - -ifeq ($(CONFIG_USB_HCI), y) -MODULE_NAME = 8723au -OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/Hal8723UHWImg_CE.o -endif - -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8723ae -OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/Hal8723EHWImg_CE.o -endif - -#hal/OUTSRC/$(RTL871X)/HalHWImg8723A_FW.o -OUTSRC_FILES += hal/OUTSRC/$(RTL871X)/HalHWImg8723A_BB.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8723A_MAC.o\ - hal/OUTSRC/$(RTL871X)/HalHWImg8723A_RF.o\ - hal/OUTSRC/$(RTL871X)/odm_RegConfig8723A.o - -OUTSRC_FILES += hal/OUTSRC/rtl8192c/HalDMOutSrc8192C_CE.o -clean_more ?= -clean_more += clean_odm-8192c - -PWRSEQ_FILES := hal/HalPwrSeqCmd.o \ - hal/$(RTL871X)/Hal8723PwrSeq.o - -CHIP_FILES += $(HAL_COMM_FILES) $(OUTSRC_FILES) $(PWRSEQ_FILES) - -ifeq ($(CONFIG_BT_COEXIST), y) -CHIP_FILES += hal/$(RTL871X)/rtl8723a_bt-coexist.o -endif - -endif - ifeq ($(CONFIG_RTL8188E), y) RTL871X = rtl8188e -HAL_COMM_FILES := hal/$(RTL871X)_xmit.o\ - hal/$(RTL871X)_sreset.o +HAL_COMM_FILES := hal/rtl8188e_xmit.o\ + hal/rtl8188e_sreset.o -ifeq ($(CONFIG_SDIO_HCI), y) -MODULE_NAME = 8189es -endif - -ifeq ($(CONFIG_USB_HCI), y) MODULE_NAME = 8188eu -endif -ifeq ($(CONFIG_PCI_HCI), y) -MODULE_NAME = 8188ee -endif - -#hal/OUTSRC/$(RTL871X)/HalHWImg8188E_FW.o OUTSRC_FILES += hal/HalHWImg8188E_MAC.o\ hal/HalHWImg8188E_BB.o\ hal/HalHWImg8188E_RF.o\ @@ -225,28 +75,12 @@ CHIP_FILES += $(HAL_COMM_FILES) $(OUTSRC_FILES) $(PWRSEQ_FILES) endif - -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 - _OS_INTFS_FILES := os_dep/osdep_service.o \ os_dep/os_intfs.o \ - os_dep/$(HCI_NAME)_intf.o \ - os_dep/$(HCI_NAME)_ops_linux.o \ + os_dep/usb_intf.o \ + os_dep/usb_ops_linux.o \ os_dep/ioctl_linux.o \ os_dep/xmit_linux.o \ os_dep/mlme_linux.o \ @@ -254,41 +88,23 @@ _OS_INTFS_FILES := os_dep/osdep_service.o \ os_dep/ioctl_cfg80211.o \ os_dep/rtw_android.o -ifeq ($(CONFIG_SDIO_HCI), y) -_OS_INTFS_FILES += os_dep/custom_gpio_linux.o -_OS_INTFS_FILES += os_dep/$(HCI_NAME)_ops_linux.o -endif - -ifeq ($(CONFIG_GSPI_HCI), y) -_OS_INTFS_FILES += os_dep/custom_gpio_linux.o -_OS_INTFS_FILES += os_dep/$(HCI_NAME)_ops_linux.o -endif - _HAL_INTFS_FILES := hal/hal_intf.o \ hal/hal_com.o \ - hal/$(RTL871X)_hal_init.o \ - hal/$(RTL871X)_phycfg.o \ - hal/$(RTL871X)_rf6052.o \ - hal/$(RTL871X)_dm.o \ - hal/$(RTL871X)_rxdesc.o \ - hal/$(RTL871X)_cmd.o \ - hal/$(HCI_NAME)_halinit.o \ + hal/rtl8188e_hal_init.o \ + hal/rtl8188e_phycfg.o \ + hal/rtl8188e_rf6052.o \ + hal/rtl8188e_dm.o \ + hal/rtl8188e_rxdesc.o \ + hal/rtl8188e_cmd.o \ + hal/usb_halinit.o \ hal/rtl$(MODULE_NAME)_led.o \ hal/rtl$(MODULE_NAME)_xmit.o \ hal/rtl$(MODULE_NAME)_recv.o -ifeq ($(CONFIG_SDIO_HCI), y) -_HAL_INTFS_FILES += hal/$(HCI_NAME)_ops.o -else -ifeq ($(CONFIG_GSPI_HCI), y) -_HAL_INTFS_FILES += hal/$(HCI_NAME)_ops.o -else -_HAL_INTFS_FILES += hal/$(HCI_NAME)_ops_linux.o -endif -endif +_HAL_INTFS_FILES += hal/usb_ops_linux.o ifeq ($(CONFIG_MP_INCLUDED), y) -_HAL_INTFS_FILES += hal/$(RTL871X)_mp.o +_HAL_INTFS_FILES += hal/rtl8188e_mp.o endif _HAL_INTFS_FILES += $(CHIP_FILES) @@ -296,19 +112,13 @@ _HAL_INTFS_FILES += $(CHIP_FILES) ifeq ($(CONFIG_AUTOCFG_CP), y) -ifeq ($(CONFIG_RTL8188E)$(CONFIG_SDIO_HCI),yy) -$(shell cp $(TopDIR)/autoconf_rtl8189e_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h) -else -$(shell cp $(TopDIR)/autoconf_$(RTL871X)_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h) -endif +$(shell cp $(TopDIR)/autoconf_rtl8188e_usb_linux.h $(TopDIR)/include/autoconf.h) endif -ifeq ($(CONFIG_USB_HCI), y) ifeq ($(CONFIG_USB_AUTOSUSPEND), y) EXTRA_CFLAGS += -DCONFIG_USB_AUTOSUSPEND endif -endif ifeq ($(CONFIG_MP_INCLUDED), y) #MODULE_NAME := $(MODULE_NAME)_mp