The generic coreboot firmware Kconfig symbols were renamed from CONFIG_GOOGLE_* to CONFIG_COREBOOT_* while keeping the old names as transitional compatibility symbols.
Select the new names directly in the arm64 defconfig so the checked-in defconfig follows the visible Kconfig symbols. Keep this separate from the rename patch so the configuration churn is easy to review independently. Signed-off-by: Sean Rhodes <[email protected]> --- arch/arm64/configs/defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 654a102cb5bc..32ec89a872d9 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -267,9 +267,9 @@ CONFIG_RASPBERRYPI_FIRMWARE=y CONFIG_INTEL_STRATIX10_SERVICE=y CONFIG_INTEL_STRATIX10_RSU=m CONFIG_MTK_ADSP_IPC=m -CONFIG_GOOGLE_FIRMWARE=y -CONFIG_GOOGLE_CBMEM=m -CONFIG_GOOGLE_COREBOOT_TABLE=m +CONFIG_COREBOOT_FIRMWARE=y +CONFIG_COREBOOT_CBMEM=m +CONFIG_COREBOOT_TABLE=m CONFIG_EFI_CAPSULE_LOADER=y CONFIG_IMX_SCU=y CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE=y
