From c972e6113f053fd8fa67282b16ccccb3eecf6c6c Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sun, 16 Feb 2025 13:08:58 -0600 Subject: [PATCH] mb/google/auron: Clean up Kconfig selections Select the newly-added SYSTEM_TYPE_ALL_IN_ONE for Buddy variant, and use that as a discriminator to de-duplicate selections for system type and HAVE_SPD_IN_CBFS. Change-Id: I0d28bc496ff6bcfa9947a4d15ed2d8f75cf74ac3 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/86455 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer --- src/mainboard/google/auron/Kconfig | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig index 72f7758b55..2381c797d9 100644 --- a/src/mainboard/google/auron/Kconfig +++ b/src/mainboard/google/auron/Kconfig @@ -10,6 +10,7 @@ config BOARD_GOOGLE_BASEBOARD_AURON select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE + select HAVE_SPD_IN_CBFS if !SYSTEM_TYPE_ALL_IN_ONE select INTEL_GMA_HAVE_VBT select INTEL_INT15 select MAINBOARD_HAS_CHROMEOS @@ -17,34 +18,26 @@ config BOARD_GOOGLE_BASEBOARD_AURON select MEMORY_MAPPED_TPM select MAINBOARD_HAS_TPM1 select SOC_INTEL_BROADWELL + select SYSTEM_TYPE_LAPTOP if !SYSTEM_TYPE_ALL_IN_ONE config BOARD_GOOGLE_AURON_PAINE select BOARD_GOOGLE_BASEBOARD_AURON - select HAVE_SPD_IN_CBFS - select SYSTEM_TYPE_LAPTOP config BOARD_GOOGLE_AURON_YUNA select BOARD_GOOGLE_BASEBOARD_AURON - select HAVE_SPD_IN_CBFS - select SYSTEM_TYPE_LAPTOP config BOARD_GOOGLE_BUDDY select BOARD_GOOGLE_BASEBOARD_AURON + select SYSTEM_TYPE_ALL_IN_ONE config BOARD_GOOGLE_GANDOF select BOARD_GOOGLE_BASEBOARD_AURON - select HAVE_SPD_IN_CBFS - select SYSTEM_TYPE_LAPTOP config BOARD_GOOGLE_LULU select BOARD_GOOGLE_BASEBOARD_AURON - select HAVE_SPD_IN_CBFS - select SYSTEM_TYPE_LAPTOP config BOARD_GOOGLE_SAMUS select BOARD_GOOGLE_BASEBOARD_AURON - select HAVE_SPD_IN_CBFS - select SYSTEM_TYPE_LAPTOP if BOARD_GOOGLE_BASEBOARD_AURON