From 6f8a578813cc9ebfc986f3205ca1931c1d49e2df Mon Sep 17 00:00:00 2001 From: HONG Yifan Date: Fri, 1 Nov 2024 11:22:11 -0700 Subject: [PATCH] ANDROID: db845c fix defconfig to be like .config Some values in defconfig are set but isn't present in the final .config. So we change them to be the value in .config. Fixes the following errors when setting kernel_build(defconfig): ERROR: CONFIG_USB_ROLE_SWITCH: actual 'y', expected 'm' from common/arch/arm64/configs/db845c_gki.fragment ERROR: CONFIG_QCOM_GLINK_SSR: actual '', expected 'm' from common/arch/arm64/configs/db845c_gki.fragment ERROR: CONFIG_MFD_QCOM_QCA639X: actual '', expected 'm' from common/arch/arm64/configs/db845c_gki.fragment ERROR: CONFIG_SM_DISPCC_8650: actual '', expected 'm' from common/arch/arm64/configs/db845c_gki.fragment Bug: 236012223 Test: check that .config does not change before and after this CL. Change-Id: Icbd7b6181a460c81ce6888a5d77d6cee00edb968 Signed-off-by: HONG Yifan --- arch/arm64/configs/db845c_gki.fragment | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm64/configs/db845c_gki.fragment b/arch/arm64/configs/db845c_gki.fragment index dc3749aefd70..363a46569ff2 100644 --- a/arch/arm64/configs/db845c_gki.fragment +++ b/arch/arm64/configs/db845c_gki.fragment @@ -29,7 +29,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=m # CONFIG_USB_DWC3_OF_SIMPLE is not set CONFIG_USB_GADGET_VBUS_DRAW=500 # CONFIG_USB_DUMMY_HCD is not set -CONFIG_USB_ROLE_SWITCH=m +CONFIG_USB_ROLE_SWITCH=y CONFIG_USB_ULPI_BUS=m CONFIG_MMC_SDHCI_MSM=m CONFIG_RTC_DRV_PM8XXX=m @@ -75,7 +75,6 @@ CONFIG_QCOM_AOSS_QMP=m CONFIG_QCOM_SMP2P=m CONFIG_QCOM_SOCINFO=m CONFIG_QCOM_APR=m -CONFIG_QCOM_GLINK_SSR=m CONFIG_RPMSG_QCOM_GLINK_RPM=m CONFIG_QCOM_PDC=m CONFIG_QCOM_SCM=m @@ -287,7 +286,6 @@ CONFIG_PINCTRL_SM8250=m CONFIG_PINCTRL_SM8250_LPASS_LPI=m CONFIG_PINCTRL_LPASS_LPI=m CONFIG_QCOM_SPMI_ADC_TM5=m -CONFIG_MFD_QCOM_QCA639X=m CONFIG_REGULATOR_QCOM_USB_VBUS=m CONFIG_DRM_DISPLAY_CONNECTOR=m CONFIG_DRM_LONTIUM_LT9611UXC=m @@ -342,7 +340,6 @@ CONFIG_SM_VIDEOCC_8550=m CONFIG_INTERCONNECT_QCOM_SM8650=m CONFIG_PINCTRL_SM8650=m CONFIG_PINCTRL_SM8650_LPASS_LPI=m -CONFIG_SM_DISPCC_8650=m CONFIG_SM_GCC_8650=m CONFIG_SM_GPUCC_8650=m CONFIG_SM_TCSRCC_8650=m