From 8beaf0f7e45013391b9463a1eedb7b094d76da97 Mon Sep 17 00:00:00 2001 From: Jakub Czapiga Date: Thu, 27 Jul 2023 08:48:00 +0000 Subject: mb/google/rex: Create Ovis4ES variant Ovis4ES variant supports only ESx SoCs. Existing Ovis variant will support QS SoCs. BUG=b:293409364 TEST=util/abuild/abuild -p none -t google/rex -b ovis4es -x -a TEST=util/abuild/abuild -p none -t google/rex -b ovis -x -a Change-Id: Iacf5ef6d3dfee8838fe13e68b254a84e4a6cf200 Signed-off-by: Jakub Czapiga Reviewed-on: https://review.coreboot.org/c/coreboot/+/76789 Reviewed-by: Subrata Banik Reviewed-by: Kapil Porwal Tested-by: build bot (Jenkins) --- src/mainboard/google/rex/Kconfig | 9 +++++++-- src/mainboard/google/rex/Kconfig.name | 6 +++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/mainboard/google/rex/Kconfig b/src/mainboard/google/rex/Kconfig index 41f251139f..d3e8f3e50d 100644 --- a/src/mainboard/google/rex/Kconfig +++ b/src/mainboard/google/rex/Kconfig @@ -72,6 +72,10 @@ config BOARD_GOOGLE_BASEBOARD_OVIS select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES select TPM_GOOGLE_TI50 +config BOARD_GOOGLE_MODEL_OVIS + def_bool n + select BOARD_GOOGLE_BASEBOARD_OVIS + if BOARD_GOOGLE_REX_COMMON config BASEBOARD_DIR @@ -119,13 +123,14 @@ config MAINBOARD_PART_NUMBER default "Screebo4ES" if BOARD_GOOGLE_SCREEBO4ES default "Karis" if BOARD_GOOGLE_KARIS default "Ovis" if BOARD_GOOGLE_OVIS + default "Ovis4ES" if BOARD_GOOGLE_OVIS4ES config VARIANT_DIR string default "rex0" if BOARD_GOOGLE_MODEL_REX default "screebo" if BOARD_GOOGLE_MODEL_SCREEBO default "karis" if BOARD_GOOGLE_KARIS - default "ovis" if BOARD_GOOGLE_OVIS + default "ovis" if BOARD_GOOGLE_MODEL_OVIS config DIMM_SPD_SIZE default 512 @@ -147,7 +152,7 @@ config OVERRIDE_DEVICETREE config DRIVER_TPM_I2C_BUS hex - default 0x4 if BOARD_GOOGLE_MODEL_REX || BOARD_GOOGLE_MODEL_SCREEBO || BOARD_GOOGLE_OVIS + default 0x4 if BOARD_GOOGLE_MODEL_REX || BOARD_GOOGLE_MODEL_SCREEBO || BOARD_GOOGLE_MODEL_OVIS config DRIVER_TPM_I2C_ADDR hex diff --git a/src/mainboard/google/rex/Kconfig.name b/src/mainboard/google/rex/Kconfig.name index 952335363d..36ad311611 100644 --- a/src/mainboard/google/rex/Kconfig.name +++ b/src/mainboard/google/rex/Kconfig.name @@ -22,7 +22,11 @@ config BOARD_GOOGLE_REX_EC_ISH config BOARD_GOOGLE_OVIS bool "-> Ovis" - select BOARD_GOOGLE_BASEBOARD_OVIS + select BOARD_GOOGLE_MODEL_OVIS + +config BOARD_GOOGLE_OVIS4ES + bool "-> Ovis4ES" + select BOARD_GOOGLE_MODEL_OVIS config BOARD_GOOGLE_REX4ES bool "-> Rex4ES" -- cgit v1.2.3