From d145a840bf79c208e5e971dc3edae0cffd73f8cb Mon Sep 17 00:00:00 2001 From: David Wu Date: Mon, 29 Apr 2024 19:56:42 +0800 Subject: mb/google/nissa: Create a riven variant Create the riven variant of nissa reference board by copying the template files to a new directory named for the variant. The riven variant is a twinlake platform. BUG=b:337169542 TEST=util/abuild/abuild -p none -t google/brya -x -a make sure the build includes GOOGLE_RIVEN Change-Id: I1be2346d87c891cc0e5fbda094e1f6e0dd60df1b Signed-off-by: David Wu Reviewed-on: https://review.coreboot.org/c/coreboot/+/82132 Reviewed-by: Kapil Porwal Reviewed-by: Eric Lai Tested-by: build bot (Jenkins) --- src/mainboard/google/brya/Kconfig | 7 +++++++ src/mainboard/google/brya/Kconfig.name | 3 +++ src/mainboard/google/brya/variants/riven/include/variant/ec.h | 8 ++++++++ .../google/brya/variants/riven/include/variant/gpio.h | 8 ++++++++ src/mainboard/google/brya/variants/riven/memory/Makefile.mk | 5 +++++ .../google/brya/variants/riven/memory/dram_id.generated.txt | 1 + .../google/brya/variants/riven/memory/mem_parts_used.txt | 11 +++++++++++ src/mainboard/google/brya/variants/riven/overridetree.cb | 6 ++++++ 8 files changed, 49 insertions(+) create mode 100644 src/mainboard/google/brya/variants/riven/include/variant/ec.h create mode 100644 src/mainboard/google/brya/variants/riven/include/variant/gpio.h create mode 100644 src/mainboard/google/brya/variants/riven/memory/Makefile.mk create mode 100644 src/mainboard/google/brya/variants/riven/memory/dram_id.generated.txt create mode 100644 src/mainboard/google/brya/variants/riven/memory/mem_parts_used.txt create mode 100644 src/mainboard/google/brya/variants/riven/overridetree.cb diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index 88dd555f14..8400807ee3 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -443,6 +443,10 @@ config BOARD_GOOGLE_REDRIX4ES select GOOGLE_DSM_PARAM_FILE_NAME if VPD select SOC_INTEL_COMMON_BLOCK_IPU +config BOARD_GOOGLE_RIVEN + select BOARD_GOOGLE_BASEBOARD_NISSA + select SOC_INTEL_TWINLAKE + config BOARD_GOOGLE_SKOLAS select BOARD_GOOGLE_BASEBOARD_BRYA select DRIVERS_GENERIC_NAU8315 @@ -645,6 +649,7 @@ config DRIVER_TPM_I2C_BUS default 0x0 if BOARD_GOOGLE_QUANDISO default 0x1 if BOARD_GOOGLE_REDRIX default 0x3 if BOARD_GOOGLE_REDRIX4ES + default 0x0 if BOARD_GOOGLE_RIVEN default 0x1 if BOARD_GOOGLE_SKOLAS default 0x1 if BOARD_GOOGLE_SKOLAS4ES default 0x1 if BOARD_GOOGLE_TAEKO @@ -733,6 +738,7 @@ config MAINBOARD_PART_NUMBER default "Quandiso" if BOARD_GOOGLE_QUANDISO default "Redrix" if BOARD_GOOGLE_REDRIX default "Redrix4ES" if BOARD_GOOGLE_REDRIX4ES + default "Riven" if BOARD_GOOGLE_RIVEN default "Skolas" if BOARD_GOOGLE_SKOLAS default "Skolas4ES" if BOARD_GOOGLE_SKOLAS4ES default "Sundance" if BOARD_GOOGLE_SUNDANCE @@ -796,6 +802,7 @@ config VARIANT_DIR default "quandiso" if BOARD_GOOGLE_QUANDISO default "redrix" if BOARD_GOOGLE_REDRIX default "redrix4es" if BOARD_GOOGLE_REDRIX4ES + default "riven" if BOARD_GOOGLE_RIVEN default "skolas" if BOARD_GOOGLE_SKOLAS default "skolas4es" if BOARD_GOOGLE_SKOLAS4ES default "sundance" if BOARD_GOOGLE_SUNDANCE diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name index fe8fcc942e..52f2c9f95c 100644 --- a/src/mainboard/google/brya/Kconfig.name +++ b/src/mainboard/google/brya/Kconfig.name @@ -122,6 +122,9 @@ config BOARD_GOOGLE_REDRIX config BOARD_GOOGLE_REDRIX4ES bool "-> Redrix4ES" +config BOARD_GOOGLE_RIVEN + bool "-> Riven" + config BOARD_GOOGLE_SKOLAS bool "-> Skolas" diff --git a/src/mainboard/google/brya/variants/riven/include/variant/ec.h b/src/mainboard/google/brya/variants/riven/include/variant/ec.h new file mode 100644 index 0000000000..7a2a6ff8b7 --- /dev/null +++ b/src/mainboard/google/brya/variants/riven/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/riven/include/variant/gpio.h b/src/mainboard/google/brya/variants/riven/include/variant/gpio.h new file mode 100644 index 0000000000..c4fe342621 --- /dev/null +++ b/src/mainboard/google/brya/variants/riven/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/riven/memory/Makefile.mk b/src/mainboard/google/brya/variants/riven/memory/Makefile.mk new file mode 100644 index 0000000000..eace2e443e --- /dev/null +++ b/src/mainboard/google/brya/variants/riven/memory/Makefile.mk @@ -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/riven/memory/dram_id.generated.txt b/src/mainboard/google/brya/variants/riven/memory/dram_id.generated.txt new file mode 100644 index 0000000000..fa247902ee --- /dev/null +++ b/src/mainboard/google/brya/variants/riven/memory/dram_id.generated.txt @@ -0,0 +1 @@ +DRAM Part Name ID to assign diff --git a/src/mainboard/google/brya/variants/riven/memory/mem_parts_used.txt b/src/mainboard/google/brya/variants/riven/memory/mem_parts_used.txt new file mode 100644 index 0000000000..2499005682 --- /dev/null +++ b/src/mainboard/google/brya/variants/riven/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.mk 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/riven/overridetree.cb b/src/mainboard/google/brya/variants/riven/overridetree.cb new file mode 100644 index 0000000000..4f2c04a57a --- /dev/null +++ b/src/mainboard/google/brya/variants/riven/overridetree.cb @@ -0,0 +1,6 @@ +chip soc/intel/alderlake + + device domain 0 on + end + +end -- cgit v1.2.3