From d234b07244f59609c636740eb249e20b225470e9 Mon Sep 17 00:00:00 2001 From: Ian Feng Date: Mon, 20 Jun 2022 09:26:49 +0800 Subject: [PATCH] mb/google/brya: Create xivu variant Create the xivu variant of the nissa reference board by copying the template files to a new directory named for the variant. (Auto-Generated by create_coreboot_variant.sh version 4.5.0). BUG=b:235025984 BRANCH=None TEST=util/abuild/abuild -p none -t google/brya -x -a make sure the build includes GOOGLE_XIVU Signed-off-by: Ian Feng Change-Id: I12341a2414e58ebc1c22429d35a03afef27adace Reviewed-on: https://review.coreboot.org/c/coreboot/+/65235 Reviewed-by: Reka Norman Reviewed-by: Kangheui Won Tested-by: build bot (Jenkins) --- src/mainboard/google/brya/Kconfig | 5 ++++- src/mainboard/google/brya/Kconfig.name | 4 ++++ .../google/brya/variants/xivu/include/variant/ec.h | 8 ++++++++ .../google/brya/variants/xivu/include/variant/gpio.h | 8 ++++++++ .../google/brya/variants/xivu/memory/Makefile.inc | 5 +++++ .../brya/variants/xivu/memory/dram_id.generated.txt | 1 + .../brya/variants/xivu/memory/mem_parts_used.txt | 11 +++++++++++ .../google/brya/variants/xivu/overridetree.cb | 6 ++++++ 8 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 src/mainboard/google/brya/variants/xivu/include/variant/ec.h create mode 100644 src/mainboard/google/brya/variants/xivu/include/variant/gpio.h create mode 100644 src/mainboard/google/brya/variants/xivu/memory/Makefile.inc create mode 100644 src/mainboard/google/brya/variants/xivu/memory/dram_id.generated.txt create mode 100644 src/mainboard/google/brya/variants/xivu/memory/mem_parts_used.txt create mode 100644 src/mainboard/google/brya/variants/xivu/overridetree.cb diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index 4ab0e29632..d88c490c92 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -142,6 +142,7 @@ config DRIVER_TPM_I2C_BUS default 0x3 if BOARD_GOOGLE_SKOLAS4ES default 0x0 if BOARD_GOOGLE_JOXER default 0x0 if BOARD_GOOGLE_PUJJO + default 0x0 if BOARD_GOOGLE_XIVU config DRIVER_TPM_I2C_ADDR hex @@ -204,6 +205,7 @@ config MAINBOARD_PART_NUMBER default "Skolas4ES" if BOARD_GOOGLE_SKOLAS4ES default "Joxer" if BOARD_GOOGLE_JOXER default "Pujjo" if BOARD_GOOGLE_PUJJO + default "Xivu" if BOARD_GOOGLE_XIVU config VARIANT_DIR default "brya0" if BOARD_GOOGLE_BRYA0 @@ -239,6 +241,7 @@ config VARIANT_DIR default "skolas4es" if BOARD_GOOGLE_SKOLAS4ES default "joxer" if BOARD_GOOGLE_JOXER default "pujjo" if BOARD_GOOGLE_PUJJO + default "xivu" if BOARD_GOOGLE_XIVU config VBOOT select VBOOT_EARLY_EC_SYNC if !BOARD_GOOGLE_BASEBOARD_NISSA @@ -273,7 +276,7 @@ config USE_PM_ACPI_TIMER choice prompt "Cache as RAM (CAR) setup configuration to use" - default USE_ADL_NEM if BOARD_GOOGLE_BRYA4ES || BOARD_GOOGLE_PRIMUS4ES || BOARD_GOOGLE_GIMBLE4ES || BOARD_GOOGLE_REDRIX4ES || BOARD_GOOGLE_TAEKO4ES || BOARD_GOOGLE_ANAHERA4ES || BOARD_GOOGLE_TANIKS || BOARD_GOOGLE_NIVVIKS || BOARD_GOOGLE_NEREID || BOARD_GOOGLE_CRAASK || BOARD_GOOGLE_SKOLAS4ES || BOARD_GOOGLE_JOXER || BOARD_GOOGLE_PUJJO + default USE_ADL_NEM if BOARD_GOOGLE_BRYA4ES || BOARD_GOOGLE_PRIMUS4ES || BOARD_GOOGLE_GIMBLE4ES || BOARD_GOOGLE_REDRIX4ES || BOARD_GOOGLE_TAEKO4ES || BOARD_GOOGLE_ANAHERA4ES || BOARD_GOOGLE_TANIKS || BOARD_GOOGLE_NIVVIKS || BOARD_GOOGLE_NEREID || BOARD_GOOGLE_CRAASK || BOARD_GOOGLE_SKOLAS4ES || BOARD_GOOGLE_JOXER || BOARD_GOOGLE_PUJJO || BOARD_GOOGLE_XIVU default USE_ADL_ENEM config USE_ADL_ENEM diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name index e0ade9ef8f..8d872c4603 100644 --- a/src/mainboard/google/brya/Kconfig.name +++ b/src/mainboard/google/brya/Kconfig.name @@ -249,3 +249,7 @@ config BOARD_GOOGLE_JOXER config BOARD_GOOGLE_PUJJO bool "-> Pujjo" select BOARD_GOOGLE_BASEBOARD_NISSA + +config BOARD_GOOGLE_XIVU + bool "-> Xivu" + select BOARD_GOOGLE_BASEBOARD_NISSA diff --git a/src/mainboard/google/brya/variants/xivu/include/variant/ec.h b/src/mainboard/google/brya/variants/xivu/include/variant/ec.h new file mode 100644 index 0000000000..7a2a6ff8b7 --- /dev/null +++ b/src/mainboard/google/brya/variants/xivu/include/variant/ec.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef __VARIANT_EC_H__ +#define __VARIANT_EC_H__ + +#include + +#endif diff --git a/src/mainboard/google/brya/variants/xivu/include/variant/gpio.h b/src/mainboard/google/brya/variants/xivu/include/variant/gpio.h new file mode 100644 index 0000000000..c4fe342621 --- /dev/null +++ b/src/mainboard/google/brya/variants/xivu/include/variant/gpio.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef VARIANT_GPIO_H +#define VARIANT_GPIO_H + +#include + +#endif diff --git a/src/mainboard/google/brya/variants/xivu/memory/Makefile.inc b/src/mainboard/google/brya/variants/xivu/memory/Makefile.inc new file mode 100644 index 0000000000..eace2e443e --- /dev/null +++ b/src/mainboard/google/brya/variants/xivu/memory/Makefile.inc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# This is an auto-generated file. Do not edit!! +# Add memory parts in mem_parts_used.txt and run spd_tools to regenerate. + +SPD_SOURCES = placeholder diff --git a/src/mainboard/google/brya/variants/xivu/memory/dram_id.generated.txt b/src/mainboard/google/brya/variants/xivu/memory/dram_id.generated.txt new file mode 100644 index 0000000000..fa247902ee --- /dev/null +++ b/src/mainboard/google/brya/variants/xivu/memory/dram_id.generated.txt @@ -0,0 +1 @@ +DRAM Part Name ID to assign diff --git a/src/mainboard/google/brya/variants/xivu/memory/mem_parts_used.txt b/src/mainboard/google/brya/variants/xivu/memory/mem_parts_used.txt new file mode 100644 index 0000000000..96211370d9 --- /dev/null +++ b/src/mainboard/google/brya/variants/xivu/memory/mem_parts_used.txt @@ -0,0 +1,11 @@ +# This is a CSV file containing a list of memory parts used by this variant. +# One part per line with an optional fixed ID in column 2. +# Only include a fixed ID if it is required for legacy reasons! +# Generated IDs are dependent on the order of parts in this file, +# so new parts must always be added at the end of the file! +# +# Generate an updated Makefile.inc and dram_id.generated.txt by running the +# part_id_gen tool from util/spd_tools. +# See util/spd_tools/README.md for more details and instructions. + +# Part Name diff --git a/src/mainboard/google/brya/variants/xivu/overridetree.cb b/src/mainboard/google/brya/variants/xivu/overridetree.cb new file mode 100644 index 0000000000..4f2c04a57a --- /dev/null +++ b/src/mainboard/google/brya/variants/xivu/overridetree.cb @@ -0,0 +1,6 @@ +chip soc/intel/alderlake + + device domain 0 on + end + +end