From 15e4c0a23f93835a7f4e3756705eaa11a3a5bc2f Mon Sep 17 00:00:00 2001 From: Jack Rosenthal Date: Mon, 18 Jul 2022 13:54:09 -0600 Subject: [PATCH] mb/google/brya/var/ghost: Split ghost4adl into 3 variants We plan to make 3 firmwares which differ only by Kconfig options and can share a common variant directory. ghost4adl: Board with an ADL chip. ghost4es: Board near identical but has RPL-ES chip. ghost: Will have final RPL silicon. Since they will only differ by Kconfig options and Intel binary blobs, let's not duplicate the variant directory but instead share it in common. BUG=b:239456576 BRANCH=firmware-brya-14505.B TEST="make menuconfig", verify layout of board selection Signed-off-by: Jack Rosenthal Change-Id: I94f2048bbe6675a807f8eba986a1ded0a4167733 Reviewed-on: https://review.coreboot.org/c/coreboot/+/65956 Tested-by: build bot (Jenkins) Reviewed-by: Eric Lai Reviewed-by: Caveh Jalali Reviewed-by: Tim Wawrzynczak Reviewed-by: Nick Vaccaro --- src/mainboard/google/brya/Kconfig | 11 +++++++++-- src/mainboard/google/brya/Kconfig.name | 10 +++++++++- .../brya/variants/{ghost4adl => ghost}/Makefile.inc | 0 .../google/brya/variants/{ghost4adl => ghost}/gpio.c | 0 .../{ghost4adl => ghost}/include/variant/ec.h | 0 .../{ghost4adl => ghost}/include/variant/gpio.h | 0 .../brya/variants/{ghost4adl => ghost}/memory.c | 0 .../variants/{ghost4adl => ghost}/memory/Makefile.inc | 2 +- .../{ghost4adl => ghost}/memory/dram_id.generated.txt | 2 +- .../{ghost4adl => ghost}/memory/mem_parts_used.txt | 0 .../variants/{ghost4adl => ghost}/overridetree.cb | 0 11 files changed, 20 insertions(+), 5 deletions(-) rename src/mainboard/google/brya/variants/{ghost4adl => ghost}/Makefile.inc (100%) rename src/mainboard/google/brya/variants/{ghost4adl => ghost}/gpio.c (100%) rename src/mainboard/google/brya/variants/{ghost4adl => ghost}/include/variant/ec.h (100%) rename src/mainboard/google/brya/variants/{ghost4adl => ghost}/include/variant/gpio.h (100%) rename src/mainboard/google/brya/variants/{ghost4adl => ghost}/memory.c (100%) rename src/mainboard/google/brya/variants/{ghost4adl => ghost}/memory/Makefile.inc (84%) rename src/mainboard/google/brya/variants/{ghost4adl => ghost}/memory/dram_id.generated.txt (80%) rename src/mainboard/google/brya/variants/{ghost4adl => ghost}/memory/mem_parts_used.txt (100%) rename src/mainboard/google/brya/variants/{ghost4adl => ghost}/overridetree.cb (100%) diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index c14bc24314..fde512f405 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -60,6 +60,11 @@ config BOARD_GOOGLE_BASEBOARD_BRASK select SOC_INTEL_ALDERLAKE_PCH_P select TPM_GOOGLE_CR50 +config BOARD_GOOGLE_BASEBOARD_GHOST + def_bool n + select BOARD_GOOGLE_BASEBOARD_BRYA if BOARD_GOOGLE_GHOST4ADL + select BOARD_GOOGLE_BASEBOARD_SKOLAS if !BOARD_GOOGLE_GHOST4ADL + config BOARD_GOOGLE_BASEBOARD_NISSA def_bool n select BOARD_GOOGLE_BRYA_COMMON @@ -116,7 +121,7 @@ config DRIVER_TPM_I2C_BUS default 0x1 if BOARD_GOOGLE_BRASK default 0x1 if BOARD_GOOGLE_PRIMUS default 0x3 if BOARD_GOOGLE_PRIMUS4ES - default 0x1 if BOARD_GOOGLE_GHOST4ADL + default 0x1 if BOARD_GOOGLE_BASEBOARD_GHOST default 0x1 if BOARD_GOOGLE_GIMBLE default 0x3 if BOARD_GOOGLE_GIMBLE4ES default 0x1 if BOARD_GOOGLE_REDRIX @@ -180,7 +185,9 @@ config MAINBOARD_PART_NUMBER default "Brask" if BOARD_GOOGLE_BRASK default "Primus" if BOARD_GOOGLE_PRIMUS default "Primus4ES" if BOARD_GOOGLE_PRIMUS4ES + default "Ghost" if BOARD_GOOGLE_GHOST default "Ghost4ADL" if BOARD_GOOGLE_GHOST4ADL + default "Ghost4ES" if BOARD_GOOGLE_GHOST4ES default "Gimble" if BOARD_GOOGLE_GIMBLE default "Gimble4ES" if BOARD_GOOGLE_GIMBLE4ES default "Redrix" if BOARD_GOOGLE_REDRIX @@ -216,7 +223,7 @@ config VARIANT_DIR default "brask" if BOARD_GOOGLE_BRASK default "primus" if BOARD_GOOGLE_PRIMUS default "primus4es" if BOARD_GOOGLE_PRIMUS4ES - default "ghost4adl" if BOARD_GOOGLE_GHOST4ADL + default "ghost" if BOARD_GOOGLE_BASEBOARD_GHOST default "gimble" if BOARD_GOOGLE_GIMBLE default "gimble4es" if BOARD_GOOGLE_GIMBLE4ES default "redrix" if BOARD_GOOGLE_REDRIX diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name index 8c2fc2e87c..6608193284 100644 --- a/src/mainboard/google/brya/Kconfig.name +++ b/src/mainboard/google/brya/Kconfig.name @@ -57,11 +57,19 @@ config BOARD_GOOGLE_FELWINTER select DRIVERS_GENERIC_GPIO_KEYS select DRIVERS_GENESYSLOGIC_GL9755 +config BOARD_GOOGLE_GHOST + bool "-> Ghost" + select BOARD_GOOGLE_BASEBOARD_GHOST + config BOARD_GOOGLE_GHOST4ADL bool "-> Ghost4ADL" - select BOARD_GOOGLE_BASEBOARD_BRYA + select BOARD_GOOGLE_BASEBOARD_GHOST select ENABLE_TCSS_DISPLAY_DETECTION if RUN_FSP_GOP +config BOARD_GOOGLE_GHOST4ES + bool "-> Ghost4ES" + select BOARD_GOOGLE_BASEBOARD_GHOST + config BOARD_GOOGLE_GIMBLE bool "-> Gimble" select BOARD_GOOGLE_BASEBOARD_BRYA diff --git a/src/mainboard/google/brya/variants/ghost4adl/Makefile.inc b/src/mainboard/google/brya/variants/ghost/Makefile.inc similarity index 100% rename from src/mainboard/google/brya/variants/ghost4adl/Makefile.inc rename to src/mainboard/google/brya/variants/ghost/Makefile.inc diff --git a/src/mainboard/google/brya/variants/ghost4adl/gpio.c b/src/mainboard/google/brya/variants/ghost/gpio.c similarity index 100% rename from src/mainboard/google/brya/variants/ghost4adl/gpio.c rename to src/mainboard/google/brya/variants/ghost/gpio.c diff --git a/src/mainboard/google/brya/variants/ghost4adl/include/variant/ec.h b/src/mainboard/google/brya/variants/ghost/include/variant/ec.h similarity index 100% rename from src/mainboard/google/brya/variants/ghost4adl/include/variant/ec.h rename to src/mainboard/google/brya/variants/ghost/include/variant/ec.h diff --git a/src/mainboard/google/brya/variants/ghost4adl/include/variant/gpio.h b/src/mainboard/google/brya/variants/ghost/include/variant/gpio.h similarity index 100% rename from src/mainboard/google/brya/variants/ghost4adl/include/variant/gpio.h rename to src/mainboard/google/brya/variants/ghost/include/variant/gpio.h diff --git a/src/mainboard/google/brya/variants/ghost4adl/memory.c b/src/mainboard/google/brya/variants/ghost/memory.c similarity index 100% rename from src/mainboard/google/brya/variants/ghost4adl/memory.c rename to src/mainboard/google/brya/variants/ghost/memory.c diff --git a/src/mainboard/google/brya/variants/ghost4adl/memory/Makefile.inc b/src/mainboard/google/brya/variants/ghost/memory/Makefile.inc similarity index 84% rename from src/mainboard/google/brya/variants/ghost4adl/memory/Makefile.inc rename to src/mainboard/google/brya/variants/ghost/memory/Makefile.inc index 9f8d085315..80729d7c29 100644 --- a/src/mainboard/google/brya/variants/ghost4adl/memory/Makefile.inc +++ b/src/mainboard/google/brya/variants/ghost/memory/Makefile.inc @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later # This is an auto-generated file. Do not edit!! # Generated by: -# ./util/spd_tools/bin/part_id_gen ADL lp5 src/mainboard/google/brya/variants/ghost4adl/memory src/mainboard/google/brya/variants/ghost4adl/memory/mem_parts_used.txt +# ./util/spd_tools/bin/part_id_gen ADL lp5 src/mainboard/google/brya/variants/ghost/memory src/mainboard/google/brya/variants/ghost/memory/mem_parts_used.txt SPD_SOURCES = SPD_SOURCES += spd/lp5/set-0/spd-1.hex # ID = 0(0b0000) Parts = H9JCNNNBK3MLYR-N6E, MT62F512M32D2DR-031 WT:B diff --git a/src/mainboard/google/brya/variants/ghost4adl/memory/dram_id.generated.txt b/src/mainboard/google/brya/variants/ghost/memory/dram_id.generated.txt similarity index 80% rename from src/mainboard/google/brya/variants/ghost4adl/memory/dram_id.generated.txt rename to src/mainboard/google/brya/variants/ghost/memory/dram_id.generated.txt index b4dc8a676b..026ac07dc3 100644 --- a/src/mainboard/google/brya/variants/ghost4adl/memory/dram_id.generated.txt +++ b/src/mainboard/google/brya/variants/ghost/memory/dram_id.generated.txt @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later # This is an auto-generated file. Do not edit!! # Generated by: -# ./util/spd_tools/bin/part_id_gen ADL lp5 src/mainboard/google/brya/variants/ghost4adl/memory src/mainboard/google/brya/variants/ghost4adl/memory/mem_parts_used.txt +# ./util/spd_tools/bin/part_id_gen ADL lp5 src/mainboard/google/brya/variants/ghost/memory src/mainboard/google/brya/variants/ghost/memory/mem_parts_used.txt DRAM Part Name ID to assign H9JCNNNBK3MLYR-N6E 0 (0000) diff --git a/src/mainboard/google/brya/variants/ghost4adl/memory/mem_parts_used.txt b/src/mainboard/google/brya/variants/ghost/memory/mem_parts_used.txt similarity index 100% rename from src/mainboard/google/brya/variants/ghost4adl/memory/mem_parts_used.txt rename to src/mainboard/google/brya/variants/ghost/memory/mem_parts_used.txt diff --git a/src/mainboard/google/brya/variants/ghost4adl/overridetree.cb b/src/mainboard/google/brya/variants/ghost/overridetree.cb similarity index 100% rename from src/mainboard/google/brya/variants/ghost4adl/overridetree.cb rename to src/mainboard/google/brya/variants/ghost/overridetree.cb