From 917785a3bbd2fe193aa8f7cb7233317f2a65d1c4 Mon Sep 17 00:00:00 2001 From: Sunway Date: Mon, 28 Jun 2021 14:33:54 +0800 Subject: [PATCH] mb/google/dedede: Create cappy2 variant Create the cappy2 variant of the waddledee 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:192035460 BRANCH=None TEST=util/abuild/abuild -p none -t google/dedede -x -a make sure the build includes GOOGLE_CAPPY2 Signed-off-by: Sunway Change-Id: I772801152b9ca9c2c6afe76a353cb2b62d6210ce Reviewed-on: https://review.coreboot.org/c/coreboot/+/55886 Tested-by: build bot (Jenkins) Reviewed-by: Karthik Ramasubramanian --- src/mainboard/google/dedede/Kconfig | 2 + src/mainboard/google/dedede/Kconfig.name | 5 +++ .../variants/cappy2/include/variant/ec.h | 8 ++++ .../variants/cappy2/include/variant/gpio.h | 8 ++++ .../variants/cappy2/memory/Makefile.inc | 5 +++ .../cappy2/memory/dram_id.generated.txt | 1 + .../variants/cappy2/memory/mem_parts_used.txt | 11 +++++ .../dedede/variants/cappy2/overridetree.cb | 42 +++++++++++++++++++ 8 files changed, 82 insertions(+) create mode 100644 src/mainboard/google/dedede/variants/cappy2/include/variant/ec.h create mode 100644 src/mainboard/google/dedede/variants/cappy2/include/variant/gpio.h create mode 100644 src/mainboard/google/dedede/variants/cappy2/memory/Makefile.inc create mode 100644 src/mainboard/google/dedede/variants/cappy2/memory/dram_id.generated.txt create mode 100644 src/mainboard/google/dedede/variants/cappy2/memory/mem_parts_used.txt create mode 100644 src/mainboard/google/dedede/variants/cappy2/overridetree.cb diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index 29be866ead..81f28fc30e 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -114,6 +114,7 @@ config MAINBOARD_PART_NUMBER default "Pirika" if BOARD_GOOGLE_PIRIKA default "Haboki" if BOARD_GOOGLE_HABOKI default "Cappy" if BOARD_GOOGLE_CAPPY + default "Cappy2" if BOARD_GOOGLE_CAPPY2 config MAX_CPUS int @@ -152,6 +153,7 @@ config VARIANT_DIR default "pirika" if BOARD_GOOGLE_PIRIKA default "haboki" if BOARD_GOOGLE_HABOKI default "cappy" if BOARD_GOOGLE_CAPPY + default "cappy2" if BOARD_GOOGLE_CAPPY2 endif #BOARD_GOOGLE_BASEBOARD_DEDEDE diff --git a/src/mainboard/google/dedede/Kconfig.name b/src/mainboard/google/dedede/Kconfig.name index 17754851cf..6c908fba4a 100644 --- a/src/mainboard/google/dedede/Kconfig.name +++ b/src/mainboard/google/dedede/Kconfig.name @@ -153,3 +153,8 @@ config BOARD_GOOGLE_CAPPY bool "-> Cappy" select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50 select BASEBOARD_DEDEDE_LAPTOP + +config BOARD_GOOGLE_CAPPY2 + bool "-> Cappy2" + select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2 + select BASEBOARD_DEDEDE_LAPTOP diff --git a/src/mainboard/google/dedede/variants/cappy2/include/variant/ec.h b/src/mainboard/google/dedede/variants/cappy2/include/variant/ec.h new file mode 100644 index 0000000000..08870e0627 --- /dev/null +++ b/src/mainboard/google/dedede/variants/cappy2/include/variant/ec.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef MAINBOARD_EC_H +#define MAINBOARD_EC_H + +#include + +#endif diff --git a/src/mainboard/google/dedede/variants/cappy2/include/variant/gpio.h b/src/mainboard/google/dedede/variants/cappy2/include/variant/gpio.h new file mode 100644 index 0000000000..9078664608 --- /dev/null +++ b/src/mainboard/google/dedede/variants/cappy2/include/variant/gpio.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef MAINBOARD_GPIO_H +#define MAINBOARD_GPIO_H + +#include + +#endif /* MAINBOARD_GPIO_H */ diff --git a/src/mainboard/google/dedede/variants/cappy2/memory/Makefile.inc b/src/mainboard/google/dedede/variants/cappy2/memory/Makefile.inc new file mode 100644 index 0000000000..b0ca2223a8 --- /dev/null +++ b/src/mainboard/google/dedede/variants/cappy2/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.spd.hex diff --git a/src/mainboard/google/dedede/variants/cappy2/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/cappy2/memory/dram_id.generated.txt new file mode 100644 index 0000000000..fa247902ee --- /dev/null +++ b/src/mainboard/google/dedede/variants/cappy2/memory/dram_id.generated.txt @@ -0,0 +1 @@ +DRAM Part Name ID to assign diff --git a/src/mainboard/google/dedede/variants/cappy2/memory/mem_parts_used.txt b/src/mainboard/google/dedede/variants/cappy2/memory/mem_parts_used.txt new file mode 100644 index 0000000000..e4258b530d --- /dev/null +++ b/src/mainboard/google/dedede/variants/cappy2/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 +# gen_part_id tool from util/spd_tools/{ddr4,lp4x}. +# See util/spd_tools/{ddr4,lp4x}/README.md for more details and instructions. + +# Part Name diff --git a/src/mainboard/google/dedede/variants/cappy2/overridetree.cb b/src/mainboard/google/dedede/variants/cappy2/overridetree.cb new file mode 100644 index 0000000000..404024b1d6 --- /dev/null +++ b/src/mainboard/google/dedede/variants/cappy2/overridetree.cb @@ -0,0 +1,42 @@ +chip soc/intel/jasperlake + + # Intel Common SoC Config + #+-------------------+---------------------------+ + #| Field | Value | + #+-------------------+---------------------------+ + #| GSPI0 | cr50 TPM. Early init is | + #| | required to set up a BAR | + #| | for TPM communication | + #| | before memory is up | + #| I2C0 | Trackpad | + #| I2C1 | Digitizer | + #| I2C2 | Touchscreen | + #| I2C3 | Camera | + #| I2C4 | Audio | + #+-------------------+---------------------------+ + register "common_soc_config" = "{ + .gspi[0] = { + .speed_mhz = 1, + .early_init = 1, + }, + .i2c[0] = { + .speed = I2C_SPEED_FAST, + }, + .i2c[1] = { + .speed = I2C_SPEED_FAST, + }, + .i2c[2] = { + .speed = I2C_SPEED_FAST, + }, + .i2c[3] = { + .speed = I2C_SPEED_FAST, + }, + .i2c[4] = { + .speed = I2C_SPEED_FAST, + }, + }" + + device domain 0 on + device pci 15.0 on end + end +end