From f9419eadf13af815f5dc5e9d3a156af2509d70d3 Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Thu, 20 Jul 2023 09:07:27 +0000 Subject: [PATCH] mb/google/rex: Use BOARD_GOOGLE_MODEL_REX instead variant name Choose BOARD_GOOGLE_MODEL_REX while setting up the default config value for variants created using google/rex model. TEST=Able to build and boot google/rex. Signed-off-by: Subrata Banik Change-Id: I107f4e375b5c9e9c0fb80c4d396164c10c1fc1e7 Reviewed-on: https://review.coreboot.org/c/coreboot/+/76657 Tested-by: build bot (Jenkins) Reviewed-by: Kapil Porwal --- src/mainboard/google/rex/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mainboard/google/rex/Kconfig b/src/mainboard/google/rex/Kconfig index bbd20e3212..c31dc8bdd8 100644 --- a/src/mainboard/google/rex/Kconfig +++ b/src/mainboard/google/rex/Kconfig @@ -107,14 +107,14 @@ config MAINBOARD_FAMILY default "Google_Ovis" if BOARD_GOOGLE_BASEBOARD_OVIS config MAINBOARD_PART_NUMBER - default "Rex" if BOARD_GOOGLE_REX0 || BOARD_GOOGLE_REX_EC_ISH || BOARD_GOOGLE_REX4ES + default "Rex" if BOARD_GOOGLE_MODEL_REX default "Screebo" if BOARD_GOOGLE_SCREEBO default "Karis" if BOARD_GOOGLE_KARIS default "Ovis" if BOARD_GOOGLE_OVIS config VARIANT_DIR string - default "rex0" if BOARD_GOOGLE_REX0 || BOARD_GOOGLE_REX_EC_ISH || BOARD_GOOGLE_REX4ES + default "rex0" if BOARD_GOOGLE_MODEL_REX default "screebo" if BOARD_GOOGLE_SCREEBO default "karis" if BOARD_GOOGLE_KARIS default "ovis" if BOARD_GOOGLE_OVIS @@ -139,7 +139,7 @@ config OVERRIDE_DEVICETREE config DRIVER_TPM_I2C_BUS hex - default 0x4 if BOARD_GOOGLE_REX0 || BOARD_GOOGLE_SCREEBO || BOARD_GOOGLE_REX_EC_ISH || BOARD_GOOGLE_OVIS || BOARD_GOOGLE_REX4ES + default 0x4 if BOARD_GOOGLE_MODEL_REX || BOARD_GOOGLE_SCREEBO || BOARD_GOOGLE_OVIS config DRIVER_TPM_I2C_ADDR hex