diff options
| -rw-r--r-- | src/mainboard/google/brya/Kconfig | 11 | ||||
| -rw-r--r-- | src/mainboard/google/brya/Kconfig.name | 10 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/ghost/Makefile.inc (renamed from src/mainboard/google/brya/variants/ghost4adl/Makefile.inc) | 0 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/ghost/gpio.c (renamed from src/mainboard/google/brya/variants/ghost4adl/gpio.c) | 0 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/ghost/include/variant/ec.h (renamed from src/mainboard/google/brya/variants/ghost4adl/include/variant/ec.h) | 0 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/ghost/include/variant/gpio.h (renamed from src/mainboard/google/brya/variants/ghost4adl/include/variant/gpio.h) | 0 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/ghost/memory.c (renamed from src/mainboard/google/brya/variants/ghost4adl/memory.c) | 0 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/ghost/memory/Makefile.inc (renamed from src/mainboard/google/brya/variants/ghost4adl/memory/Makefile.inc) | 2 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/ghost/memory/dram_id.generated.txt (renamed from src/mainboard/google/brya/variants/ghost4adl/memory/dram_id.generated.txt) | 2 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/ghost/memory/mem_parts_used.txt (renamed from src/mainboard/google/brya/variants/ghost4adl/memory/mem_parts_used.txt) | 0 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/ghost/overridetree.cb (renamed from src/mainboard/google/brya/variants/ghost4adl/overridetree.cb) | 0 |
11 files changed, 20 insertions, 5 deletions
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 index 073317f666..073317f666 100644 --- a/src/mainboard/google/brya/variants/ghost4adl/Makefile.inc +++ b/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 index e6a80f0fb5..e6a80f0fb5 100644 --- a/src/mainboard/google/brya/variants/ghost4adl/gpio.c +++ b/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 index 7a2a6ff8b7..7a2a6ff8b7 100644 --- a/src/mainboard/google/brya/variants/ghost4adl/include/variant/ec.h +++ b/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 index c4fe342621..c4fe342621 100644 --- a/src/mainboard/google/brya/variants/ghost4adl/include/variant/gpio.h +++ b/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 index 4503a1f587..4503a1f587 100644 --- a/src/mainboard/google/brya/variants/ghost4adl/memory.c +++ b/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 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 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 index 6f4f2a7177..6f4f2a7177 100644 --- a/src/mainboard/google/brya/variants/ghost4adl/memory/mem_parts_used.txt +++ b/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 index b20593a479..b20593a479 100644 --- a/src/mainboard/google/brya/variants/ghost4adl/overridetree.cb +++ b/src/mainboard/google/brya/variants/ghost/overridetree.cb |