From b41d48a09c27ec24ea780d9415ed61369f31fb59 Mon Sep 17 00:00:00 2001 From: Bernardo Perez Priego Date: Mon, 21 Aug 2023 17:37:09 -0700 Subject: [PATCH] mb/google/rex: Add `rex4es_ec_ish` variant This patch creates rex ES variant with EC ISH enabled. BUG=b:296886409 TEST=Able to build and boot rex4es_ec_ish variant. Signed-off-by: Bernardo Perez Priego Change-Id: I2b1cdb8cffd66badd90a7bf9825d9decb07941a8 Reviewed-on: https://review.coreboot.org/c/coreboot/+/77358 Tested-by: build bot (Jenkins) Reviewed-by: Martin L Roth Reviewed-by: Subrata Banik Reviewed-by: Kapil Porwal --- 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 cc15b7b1fe..78dc780ca9 100644 --- a/src/mainboard/google/rex/Kconfig +++ b/src/mainboard/google/rex/Kconfig @@ -56,6 +56,11 @@ config BOARD_GOOGLE_MODEL_REX select DRIVERS_SOUNDWIRE_CS42L42 select DRIVERS_SOUNDWIRE_MAX98363 +config BOARD_GOOGLE_MODEL_REX_EC_ISH + def_bool n + select BOARD_GOOGLE_MODEL_REX + select SOC_INTEL_STORE_ISH_FW_VERSION + config BOARD_GOOGLE_MODEL_SCREEBO def_bool n select BOARD_GOOGLE_BASEBOARD_REX @@ -117,8 +122,8 @@ config DEVICETREE default "variants/baseboard/\$(CONFIG_BASEBOARD_DIR)/devicetree.cb" config FMDFILE - default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos_ec_ish-debug-fsp.fmd" if CHROMEOS && BOARD_GOOGLE_REX_EC_ISH && BUILDING_WITH_DEBUG_FSP - default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos_ec_ish.fmd" if CHROMEOS && BOARD_GOOGLE_REX_EC_ISH + default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos_ec_ish-debug-fsp.fmd" if CHROMEOS && BOARD_GOOGLE_MODEL_REX_EC_ISH && BUILDING_WITH_DEBUG_FSP + default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos_ec_ish.fmd" if CHROMEOS && BOARD_GOOGLE_MODEL_REX_EC_ISH default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-debug-fsp.fmd" if CHROMEOS && BUILDING_WITH_DEBUG_FSP default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if CHROMEOS @@ -134,6 +139,7 @@ config MAINBOARD_PART_NUMBER default "Rex" if BOARD_GOOGLE_REX0 default "Rex_Ec_Ish" if BOARD_GOOGLE_REX_EC_ISH default "Rex4ES" if BOARD_GOOGLE_REX4ES + default "Rex4ES_Ec_Ish" if BOARD_GOOGLE_REX4ES_EC_ISH default "Screebo" if BOARD_GOOGLE_SCREEBO default "Screebo4ES" if BOARD_GOOGLE_SCREEBO4ES default "Karis" if BOARD_GOOGLE_KARIS diff --git a/src/mainboard/google/rex/Kconfig.name b/src/mainboard/google/rex/Kconfig.name index fc9a4771bb..611916922b 100644 --- a/src/mainboard/google/rex/Kconfig.name +++ b/src/mainboard/google/rex/Kconfig.name @@ -22,8 +22,7 @@ config BOARD_GOOGLE_KARIS4ES config BOARD_GOOGLE_REX_EC_ISH bool "-> Rex EC ISH" - select BOARD_GOOGLE_MODEL_REX - select SOC_INTEL_STORE_ISH_FW_VERSION + select BOARD_GOOGLE_MODEL_REX_EC_ISH config BOARD_GOOGLE_OVIS bool "-> Ovis" @@ -36,3 +35,7 @@ config BOARD_GOOGLE_OVIS4ES config BOARD_GOOGLE_REX4ES bool "-> Rex4ES" select BOARD_GOOGLE_MODEL_REX + +config BOARD_GOOGLE_REX4ES_EC_ISH + bool "-> Rex4ES EC ISH" + select BOARD_GOOGLE_MODEL_REX_EC_ISH