From df76805ec63162671c9ef0ec5a16b9d834aa03b2 Mon Sep 17 00:00:00 2001 From: Mayank Rana Date: Fri, 10 Jan 2020 14:35:41 -0800 Subject: [PATCH] arm64: defconfig: Remove CONFIG_SPS from lahaina_debug.config lahaina_QGKI.config takes care of enabling CONFIG_SPS and CONFIG_USB_BAM in lahaina_debug.config. CONFIG_USB_BAM depends on CONFIG_SPS. Currently CONFIG_SPS is enabled in both lahaina_debug.config and lahaina_QGKI.config whereas CONFIG_USB_BAM is enabled only in lahaina_QGKI.config and also explicitly marked as "not set" in lahaina_debug.config. This conflict between the fragments results into CONFIG_USB_BAM remaining disabled in the combined lahaina-qgki-debug_defconfig. Clean this up by removing their redundant entries from lahaina_debug.config so that both CONFIG_SPS and CONFIG_USB_BAM are only enabled in the lahaina_QKI.config fragment. Change-Id: I5dba04e64a04bc16aa6603ca617681decaf19c36 Signed-off-by: Mayank Rana --- arch/arm64/configs/vendor/lahaina_debug.config | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm64/configs/vendor/lahaina_debug.config b/arch/arm64/configs/vendor/lahaina_debug.config index 2eaf4072aa58..ab8f8b87d93d 100644 --- a/arch/arm64/configs/vendor/lahaina_debug.config +++ b/arch/arm64/configs/vendor/lahaina_debug.config @@ -42,10 +42,6 @@ CONFIG_CNSS_QCA6490=y CONFIG_CNSS_UTILS=m CONFIG_CNSS_GENL=m CONFIG_WCNSS_MEM_PRE_ALLOC=m -CONFIG_SPS=y -CONFIG_SPS_SUPPORT_NDP_BAM=y -# CONFIG_SPS_SUPPORT_BAMDMA is not set -# CONFIG_USB_BAM is not set # CONFIG_QCOM_SPMI_TEMP_ALARM is not set CONFIG_MHI_BUS=y CONFIG_MHI_DEBUG=y