Commit df76805e authored Jan 10, 2020 by Mayank Rana

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 <mrana@codeaurora.org>

parent 137a997b

arch/arm64/configs/vendor/lahaina_debug.config

+0 −4

Original line number	Diff line number	Diff line
		@@ -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