From 59a220b91430ea48c139624aa6c59d61b76f989c Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Sat, 22 Jul 2023 20:32:08 +0000 Subject: mb/google/rex: Create screebo4es variant This patch creates a new variant screebo4es. The new variant will support only ESx samples. The existing rex variant will support the QS samples. BUG=b:292280656 TEST=Able to build google/screebo4es board and boot on target hardware. Change-Id: If77b4a773bee3633008d39c1886b61869c9618de Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/c/coreboot/+/76668 Tested-by: build bot (Jenkins) Reviewed-by: Kapil Porwal Reviewed-by: Eric Lai --- src/mainboard/google/rex/Kconfig | 10 ++++++++-- src/mainboard/google/rex/Kconfig.name | 7 +++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/mainboard/google/rex/Kconfig b/src/mainboard/google/rex/Kconfig index 0a28809341..41f251139f 100644 --- a/src/mainboard/google/rex/Kconfig +++ b/src/mainboard/google/rex/Kconfig @@ -54,6 +54,11 @@ config BOARD_GOOGLE_MODEL_REX select DRIVERS_SOUNDWIRE_CS42L42 select DRIVERS_SOUNDWIRE_MAX98363 +config BOARD_GOOGLE_MODEL_SCREEBO + def_bool n + select BOARD_GOOGLE_BASEBOARD_REX + select DRIVERS_GENERIC_ALC1015 + config BOARD_GOOGLE_BASEBOARD_OVIS def_bool n select BOARD_GOOGLE_REX_COMMON @@ -111,13 +116,14 @@ config MAINBOARD_PART_NUMBER default "Rex_Ec_Ish" if BOARD_GOOGLE_REX_EC_ISH default "Rex4ES" if BOARD_GOOGLE_REX4ES default "Screebo" if BOARD_GOOGLE_SCREEBO + default "Screebo4ES" if BOARD_GOOGLE_SCREEBO4ES default "Karis" if BOARD_GOOGLE_KARIS default "Ovis" if BOARD_GOOGLE_OVIS config VARIANT_DIR string default "rex0" if BOARD_GOOGLE_MODEL_REX - default "screebo" if BOARD_GOOGLE_SCREEBO + default "screebo" if BOARD_GOOGLE_MODEL_SCREEBO default "karis" if BOARD_GOOGLE_KARIS default "ovis" if BOARD_GOOGLE_OVIS @@ -141,7 +147,7 @@ config OVERRIDE_DEVICETREE config DRIVER_TPM_I2C_BUS hex - default 0x4 if BOARD_GOOGLE_MODEL_REX || BOARD_GOOGLE_SCREEBO || BOARD_GOOGLE_OVIS + default 0x4 if BOARD_GOOGLE_MODEL_REX || BOARD_GOOGLE_MODEL_SCREEBO || BOARD_GOOGLE_OVIS config DRIVER_TPM_I2C_ADDR hex diff --git a/src/mainboard/google/rex/Kconfig.name b/src/mainboard/google/rex/Kconfig.name index eea2a528f2..952335363d 100644 --- a/src/mainboard/google/rex/Kconfig.name +++ b/src/mainboard/google/rex/Kconfig.name @@ -6,8 +6,11 @@ config BOARD_GOOGLE_REX0 config BOARD_GOOGLE_SCREEBO bool "-> Screebo" - select BOARD_GOOGLE_BASEBOARD_REX - select DRIVERS_GENERIC_ALC1015 + select BOARD_GOOGLE_MODEL_SCREEBO + +config BOARD_GOOGLE_SCREEBO4ES + bool "-> Screebo4ES" + select BOARD_GOOGLE_MODEL_SCREEBO config BOARD_GOOGLE_KARIS bool "-> Karis" -- cgit v1.2.3