From b40a831c0f1d1cdd9342c5bf09f259d0834c442f Mon Sep 17 00:00:00 2001 From: Stricted Date: Wed, 21 Mar 2018 15:41:24 +0100 Subject: [PATCH] disable some mediatekl custom warnings --- arch/arm/configs/ttab_debug_defconfig | 2 -- arch/arm/configs/ttab_defconfig | 2 -- drivers/misc/mediatek/Kconfig.drivers | 8 +------- drivers/misc/mediatek/Makefile | 2 +- drivers/misc/mediatek/fmradio/Makefile | 22 +++++++++++----------- drivers/misc/mediatek/ssw/Makefile | 4 ++-- 6 files changed, 15 insertions(+), 25 deletions(-) diff --git a/arch/arm/configs/ttab_debug_defconfig b/arch/arm/configs/ttab_debug_defconfig index 4a80e6cf5c11..e61101395bd2 100644 --- a/arch/arm/configs/ttab_debug_defconfig +++ b/arch/arm/configs/ttab_debug_defconfig @@ -1463,7 +1463,6 @@ CONFIG_MTK_GPU_SUPPORT=y CONFIG_MTK_KERNEL_POWER_OFF_CHARGING=y # CONFIG_MTK_BQ24160_SUPPORT is not set # CONFIG_MTK_MT8193_SUPPORT is not set -# CONFIG_MTK_HDMI_SUPPORT is not set # CONFIG_MTK_MT8193_HDCP_SUPPORT is not set CONFIG_CUSTOM_KERNEL_HDMI="" CONFIG_MTK_HDMI_SUPPORT=y @@ -2214,7 +2213,6 @@ CONFIG_SND_DRIVERS=y # CONFIG_SND_MPU401 is not set # CONFIG_SND_ARM is not set # CONFIG_SND_SPI is not set -# CONFIG_SND_USB is not set # CONFIG_SND_SOC is not set # CONFIG_SOUND_PRIME is not set diff --git a/arch/arm/configs/ttab_defconfig b/arch/arm/configs/ttab_defconfig index f0606cf55da3..c64e5d62f517 100644 --- a/arch/arm/configs/ttab_defconfig +++ b/arch/arm/configs/ttab_defconfig @@ -1461,7 +1461,6 @@ CONFIG_MTK_GPU_SUPPORT=y CONFIG_MTK_KERNEL_POWER_OFF_CHARGING=y # CONFIG_MTK_BQ24160_SUPPORT is not set # CONFIG_MTK_MT8193_SUPPORT is not set -# CONFIG_MTK_HDMI_SUPPORT is not set # CONFIG_MTK_MT8193_HDCP_SUPPORT is not set CONFIG_CUSTOM_KERNEL_HDMI="" CONFIG_MTK_HDMI_SUPPORT=y @@ -2210,7 +2209,6 @@ CONFIG_SND_DRIVERS=y # CONFIG_SND_MPU401 is not set # CONFIG_SND_ARM is not set # CONFIG_SND_SPI is not set -# CONFIG_SND_USB is not set # CONFIG_SND_SOC is not set # CONFIG_SOUND_PRIME is not set diff --git a/drivers/misc/mediatek/Kconfig.drivers b/drivers/misc/mediatek/Kconfig.drivers index d131bcbf3970..efc7bc53cbd5 100644 --- a/drivers/misc/mediatek/Kconfig.drivers +++ b/drivers/misc/mediatek/Kconfig.drivers @@ -778,12 +778,6 @@ config MTK_MLC_NAND_SUPPORT depends on MTK_MTD_NAND ---help--- Enables support for MLC NAND. - -config MTK_COMBO_NAND_SUPPORT - tristate "Mediatek COMBO NAND Support" - depends on MTK_MTD_NAND - ---help--- - Enables support for COMBO NAND. # Power Related if POWER_SUPPLY @@ -1642,7 +1636,7 @@ config MTK_THERMAL_PA_VIA_ATCMD config MTK_COMBO_NAND_SUPPORT bool "MTK_COMBO_NAND_SUPPORT" - depends on !MTK_EMMC_SUPPORT + depends on MTK_MTD_NAND && !MTK_EMMC_SUPPORT help To support different NAND page size on the same load diff --git a/drivers/misc/mediatek/Makefile b/drivers/misc/mediatek/Makefile index cf7e1dac27d9..77d310e33829 100644 --- a/drivers/misc/mediatek/Makefile +++ b/drivers/misc/mediatek/Makefile @@ -284,7 +284,7 @@ obj-$(CONFIG_MTK_SCHED_CMP_POWER_AWARE_CONTROLLER) += pa/ obj-$(CONFIG_HMP_POWER_AWARE_CONTROLLER) += pa_hmp/ #widevine drm -$(warning "CONFIG_TRUSTONIC_TEE_SUPPORT = $(CONFIG_TRUSTONIC_TEE_SUPPORT)") +#$(warning "CONFIG_TRUSTONIC_TEE_SUPPORT = $(CONFIG_TRUSTONIC_TEE_SUPPORT)") obj-$(CONFIG_TRUSTONIC_TEE_SUPPORT) += secwidevine/ obj-$(CONFIG_MTK_IN_HOUSE_TEE_SUPPORT) += trustzone/ diff --git a/drivers/misc/mediatek/fmradio/Makefile b/drivers/misc/mediatek/fmradio/Makefile index 21d83aef9c42..17db57b62de6 100755 --- a/drivers/misc/mediatek/fmradio/Makefile +++ b/drivers/misc/mediatek/fmradio/Makefile @@ -10,9 +10,9 @@ subdir-ccflags-y += -I$(srctree)/drivers/misc/mediatek/mach/$(MTK_PLATFORM)/incl # MT6628 FM driver #ifeq ($(CONFIG_MTK_FM_CHIP), MT6628_FM) -$(warning feature_option=$(CONFIG_MTK_FM_CHIP)) +#$(warning feature_option=$(CONFIG_MTK_FM_CHIP)) ifeq ($(findstring MT6628_FM,$(CONFIG_MTK_FM_CHIP)),MT6628_FM) -$(warning MT6628_FM) +#$(warning MT6628_FM) FM_CHIP := mt6628 FM_CHIP_PATH := $(FM_CHIP)/pub/$(FM_CHIP) ccflags-y += -I$(src)/inc \ @@ -35,7 +35,7 @@ obj-$(CONFIG_MTK_FM) += mtk_fm_drv.o $(FM_CHIP_PATH)_fm_cmd.o \ $(FM_CHIP_PATH)_fm_config.o mtk_fm_drv-objs += $(mt6628-objs) -$(warning $(mtk_fm_drv-objs)) +#$(warning $(mtk_fm_drv-objs)) #obj-$(CONFIG_MTK_FM) += private/ endif @@ -43,7 +43,7 @@ endif #ifeq ($(CONFIG_MTK_FM_CHIP), MT6620_FM) ifeq ($(findstring MT6620_FM,$(CONFIG_MTK_FM_CHIP)),MT6620_FM) -$(warning MT6620_FM) +#$(warning MT6620_FM) FM_CHIP := mt6620 FM_CHIP_PATH := $(FM_CHIP)/pub/$(FM_CHIP) ccflags-y += -I$(src)/inc \ @@ -66,7 +66,7 @@ $(warning MT6620_FM) $(FM_CHIP_PATH)_fm_cmd.o \ $(FM_CHIP_PATH)_fm_config.o mtk_fm_drv-objs += $(mt6620-objs) -$(warning $(mtk_fm_drv-objs)) +#$(warning $(mtk_fm_drv-objs)) #obj-$(CONFIG_MTK_FM) += private/ endif #$(foreach each_chip, $(CONFIG_MTK_FM_CHIP),$(eval $(call build_speical_fm_driver,$(each_chip)))) @@ -75,7 +75,7 @@ endif # MT6627 FM driver ifeq ($(findstring MT6627_FM,$(CONFIG_MTK_FM_CHIP)),MT6627_FM) -$(warning MT6627_FM) +#$(warning MT6627_FM) FM_CHIP := mt6627 FM_CHIP_PATH := $(FM_CHIP)/pub/$(FM_CHIP) ccflags-y += -DMT6627_FM @@ -99,14 +99,14 @@ $(warning MT6627_FM) $(FM_CHIP_PATH)_fm_cmd.o \ $(FM_CHIP_PATH)_fm_config.o mtk_fm_drv-objs += $(mt6627-objs) -$(warning $(mtk_fm_drv-objs)) +#$(warning $(mtk_fm_drv-objs)) #obj-$(CONFIG_MTK_FM) += private/ endif # MT6625 FM driver ifeq ($(findstring MT6625_FM,$(CONFIG_MTK_FM_CHIP)),MT6625_FM) -$(warning MT6627_FM) +#$(warning MT6627_FM) FM_CHIP := mt6627 FM_CHIP_PATH := $(FM_CHIP)/pub/$(FM_CHIP) ccflags-y += -DMT6627_FM @@ -131,13 +131,13 @@ $(warning MT6627_FM) $(FM_CHIP_PATH)_fm_cmd.o \ $(FM_CHIP_PATH)_fm_config.o mtk_fm_drv-objs += $(mt6627-objs) -$(warning $(mtk_fm_drv-objs)) +#$(warning $(mtk_fm_drv-objs)) #obj-$(CONFIG_MTK_FM) += private/ endif # MT6630 FM driver ifeq ($(findstring MT6630_FM,$(CONFIG_MTK_FM_CHIP)),MT6630_FM) -$(warning MT6630_FM) +#$(warning MT6630_FM) FM_CHIP := mt6630 FM_CHIP_PATH := $(FM_CHIP)/pub/$(FM_CHIP) ccflags-y += -DMT6630_FM @@ -161,7 +161,7 @@ $(warning MT6630_FM) $(FM_CHIP_PATH)_fm_cmd.o \ $(FM_CHIP_PATH)_fm_config.o mtk_fm_drv-objs += $(mt6630-objs) -$(warning $(mtk_fm_drv-objs)) +#$(warning $(mtk_fm_drv-objs)) #obj-$(CONFIG_MTK_FM) += private/ endif diff --git a/drivers/misc/mediatek/ssw/Makefile b/drivers/misc/mediatek/ssw/Makefile index 0708db48d64e..34ca0fa115d5 100755 --- a/drivers/misc/mediatek/ssw/Makefile +++ b/drivers/misc/mediatek/ssw/Makefile @@ -2,9 +2,9 @@ SSW_DIR=$(srctree)/drivers/misc/mediatek/ssw/$(subst ",,$(CONFIG_CUSTOM_KERNEL_S ssw_exist=$(shell if [ -d ${SSW_DIR} ]; then echo "y"; else echo "n"; fi;) ifeq ($(ssw_exist), y) obj-y += $(subst ",,$(CONFIG_CUSTOM_KERNEL_SSW))/ -$(warning "SSW_DIR=$(SSW_DIR)ssw_exist=$(ssw_exist)") +#$(warning "SSW_DIR=$(SSW_DIR)ssw_exist=$(ssw_exist)") else -$(warning "no $(SSW_DIR) folder, need check config ssw_exist=$(ssw_exist)") +#$(warning "no $(SSW_DIR) folder, need check config ssw_exist=$(ssw_exist)") obj- := dummy.o # avoid build error endif -- 2.20.1