From d042bbe3b728c4e1a0b6f24adbd1017b3787b846 Mon Sep 17 00:00:00 2001 From: HONG Yifan Date: Fri, 1 Nov 2024 11:39:49 -0700 Subject: [PATCH] ANDROID: yukawa 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_BRCMUTIL: actual '', expected 'm' from common/arch/arm64/configs/amlogic_gki.fragment ERROR: CONFIG_BRCMFMAC: actual '', expected 'm' from common/arch/arm64/configs/amlogic_gki.fragment ERROR: CONFIG_BRCMFMAC_PROTO_BCDC: actual '', expected 'y' from common/arch/arm64/configs/amlogic_gki.fragment ERROR: CONFIG_BRCMFMAC_SDIO: actual '', expected 'y' from common/arch/arm64/configs/amlogic_gki.fragment ERROR: CONFIG_COMMON_CLK_MESON_REGMAP: actual 'y', expected 'm' from common/arch/arm64/configs/amlogic_gki.fragment ERROR: CONFIG_COMMON_CLK_MESON_DUALDIV: actual 'y', expected 'm' from common/arch/arm64/configs/amlogic_gki.fragment ERROR: CONFIG_COMMON_CLK_MESON_MPLL: actual 'y', expected 'm' from common/arch/arm64/configs/amlogic_gki.fragment ERROR: CONFIG_COMMON_CLK_MESON_PLL: actual 'y', expected 'm' from common/arch/arm64/configs/amlogic_gki.fragment ERROR: CONFIG_COMMON_CLK_MESON_VID_PLL_DIV: actual 'y', expected 'm' from common/arch/arm64/configs/amlogic_gki.fragment ERROR: CONFIG_MTD_NAND_MESON: actual '', expected 'm' from common/arch/arm64/configs/amlogic_gki.fragment ERROR: CONFIG_MESON_EFUSE: actual '', expected 'm' from common/arch/arm64/configs/amlogic_gki.fragment ERROR: CONFIG_MESON_GX_PM_DOMAINS: actual '', expected 'm' from common/arch/arm64/configs/amlogic_gki.fragment Bug: 236012223 Test: check that .config doesn't change before and after this CL. Change-Id: I3685be705860d2694b3447ac932f6a59c6745652 Signed-off-by: HONG Yifan --- arch/arm64/configs/amlogic_gki.fragment | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/arch/arm64/configs/amlogic_gki.fragment b/arch/arm64/configs/amlogic_gki.fragment index e577f550c46c..4aca7f46e8de 100644 --- a/arch/arm64/configs/amlogic_gki.fragment +++ b/arch/arm64/configs/amlogic_gki.fragment @@ -19,10 +19,6 @@ CONFIG_STMMAC_PLATFORM=m # WLAN # CONFIG_WLAN_VENDOR_BROADCOM=y -CONFIG_BRCMUTIL=m -CONFIG_BRCMFMAC=m -CONFIG_BRCMFMAC_PROTO_BCDC=y -CONFIG_BRCMFMAC_SDIO=y # # Amlogic @@ -41,13 +37,13 @@ CONFIG_RESET_MESON=m CONFIG_MESON_IRQ_GPIO=m # clocks -CONFIG_COMMON_CLK_MESON_REGMAP=m -CONFIG_COMMON_CLK_MESON_DUALDIV=m -CONFIG_COMMON_CLK_MESON_MPLL=m +CONFIG_COMMON_CLK_MESON_REGMAP=y +CONFIG_COMMON_CLK_MESON_DUALDIV=y +CONFIG_COMMON_CLK_MESON_MPLL=y CONFIG_COMMON_CLK_MESON_PHASE=m -CONFIG_COMMON_CLK_MESON_PLL=m +CONFIG_COMMON_CLK_MESON_PLL=y CONFIG_COMMON_CLK_MESON_SCLK_DIV=m -CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=m +CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y CONFIG_COMMON_CLK_MESON_AO_CLKC=m CONFIG_COMMON_CLK_MESON_EE_CLKC=m CONFIG_COMMON_CLK_MESON_CPU_DYNDIV=m @@ -83,10 +79,8 @@ CONFIG_PINCTRL_MESON_AXG_PMX=m CONFIG_PINCTRL_MESON_G12A=m CONFIG_MESON_GXBB_WATCHDOG=m CONFIG_MESON_WATCHDOG=m -CONFIG_MTD_NAND_MESON=m CONFIG_PWM_MESON=m CONFIG_IR_MESON=m -CONFIG_MESON_EFUSE=m CONFIG_MFD_KHADAS_MCU=m CONFIG_KHADAS_MCU_FAN_THERMAL=m CONFIG_AMLOGIC_THERMAL=m @@ -110,7 +104,6 @@ CONFIG_VIDEO_MESON_GE2D=m # SoC drivers CONFIG_MESON_CANVAS=m CONFIG_MESON_CLK_MEASURE=m -CONFIG_MESON_GX_PM_DOMAINS=m CONFIG_MESON_EE_PM_DOMAINS=m CONFIG_MESON_SECURE_PM_DOMAINS=m