From fac28854054d96e2e7840a4a294fbbbaf622c0a3 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 23 Sep 2023 21:50:43 +0200 Subject: [PATCH] mb/google/guybrush: Use only one option for common selects BOARD_SPECIFIC_OPTIONS is duplicate to BOARD_GOOGLE_BASEBOARD_GUYBRUSH. Thus, move all selects to the latter option. Change-Id: I570c3cfd3d100ad90e35ec5d89686cb6a4bd8e82 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/78102 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/mainboard/google/guybrush/Kconfig | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/mainboard/google/guybrush/Kconfig b/src/mainboard/google/guybrush/Kconfig index 43fd84881b..7f233bead5 100644 --- a/src/mainboard/google/guybrush/Kconfig +++ b/src/mainboard/google/guybrush/Kconfig @@ -2,21 +2,6 @@ config BOARD_GOOGLE_BASEBOARD_GUYBRUSH def_bool n - -config BOARD_GOOGLE_GUYBRUSH - select BOARD_GOOGLE_BASEBOARD_GUYBRUSH - -config BOARD_GOOGLE_NIPPERKIN - select BOARD_GOOGLE_BASEBOARD_GUYBRUSH - select DRIVERS_GFX_GENERIC - -config BOARD_GOOGLE_DEWATT - select BOARD_GOOGLE_BASEBOARD_GUYBRUSH - -if BOARD_GOOGLE_BASEBOARD_GUYBRUSH - -config BOARD_SPECIFIC_OPTIONS - def_bool y select AMD_SOC_CONSOLE_UART select BOARD_ROMSIZE_KB_16384 select CONSOLE_CBMEM_DUMP_TO_UART if !CONSOLE_SERIAL @@ -61,6 +46,18 @@ config BOARD_SPECIFIC_OPTIONS select TPM_GOOGLE_CR50 select AMD_FWM_POSITION_C20000_DEFAULT +config BOARD_GOOGLE_GUYBRUSH + select BOARD_GOOGLE_BASEBOARD_GUYBRUSH + +config BOARD_GOOGLE_NIPPERKIN + select BOARD_GOOGLE_BASEBOARD_GUYBRUSH + select DRIVERS_GFX_GENERIC + +config BOARD_GOOGLE_DEWATT + select BOARD_GOOGLE_BASEBOARD_GUYBRUSH + +if BOARD_GOOGLE_BASEBOARD_GUYBRUSH + config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_LID_SWITCH