From c08585674afd75a3b01a0cbada6a15bff0ec503e Mon Sep 17 00:00:00 2001 From: Liam Flaherty Date: Fri, 6 Jan 2023 14:01:16 +1100 Subject: [PATCH] mb/google/dedede: Create dibbi variant Create the dibbi variant of the waddledee reference board by copying the template files to a new directory. BUG=b:260934018 BRANCH=dedede TEST=util/abuild/abuild -p none -t google/dedede -x -a includes GOOGLE_DIBBI Change-Id: I3b8d4e7f8a53323f56567cbbc03bab7f8804f286 Signed-off-by: Liam Flaherty Reviewed-on: https://review.coreboot.org/c/coreboot/+/71709 Reviewed-by: Adam Mills Reviewed-by: Sam McNally Tested-by: build bot (Jenkins) --- src/mainboard/google/dedede/Kconfig | 2 + src/mainboard/google/dedede/Kconfig.name | 4 ++ .../variants/dibbi/include/variant/ec.h | 8 ++++ .../variants/dibbi/include/variant/gpio.h | 8 ++++ .../dedede/variants/dibbi/memory/Makefile.inc | 5 +++ .../dibbi/memory/dram_id.generated.txt | 1 + .../variants/dibbi/memory/mem_parts_used.txt | 11 +++++ .../dedede/variants/dibbi/overridetree.cb | 42 +++++++++++++++++++ 8 files changed, 81 insertions(+) create mode 100644 src/mainboard/google/dedede/variants/dibbi/include/variant/ec.h create mode 100644 src/mainboard/google/dedede/variants/dibbi/include/variant/gpio.h create mode 100644 src/mainboard/google/dedede/variants/dibbi/memory/Makefile.inc create mode 100644 src/mainboard/google/dedede/variants/dibbi/memory/dram_id.generated.txt create mode 100644 src/mainboard/google/dedede/variants/dibbi/memory/mem_parts_used.txt create mode 100644 src/mainboard/google/dedede/variants/dibbi/overridetree.cb diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index 8901da3031..ca72da1ac4 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -88,6 +88,7 @@ config MAINBOARD_FAMILY config MAINBOARD_PART_NUMBER default "Boten" if BOARD_GOOGLE_BOTEN + default "Dibbi" if BOARD_GOOGLE_DIBBI default "Dedede" if BOARD_GOOGLE_DEDEDE default "Drawcia" if BOARD_GOOGLE_DRAWCIA default "Madoo" if BOARD_GOOGLE_MADOO @@ -127,6 +128,7 @@ config UART_FOR_CONSOLE config VARIANT_DIR default "boten" if BOARD_GOOGLE_BOTEN + default "dibbi" if BOARD_GOOGLE_DIBBI default "dedede" if BOARD_GOOGLE_DEDEDE default "drawcia" if BOARD_GOOGLE_DRAWCIA default "madoo" if BOARD_GOOGLE_MADOO diff --git a/src/mainboard/google/dedede/Kconfig.name b/src/mainboard/google/dedede/Kconfig.name index 4f2fa04102..eeed1aaa1d 100644 --- a/src/mainboard/google/dedede/Kconfig.name +++ b/src/mainboard/google/dedede/Kconfig.name @@ -8,6 +8,10 @@ config BOARD_GOOGLE_BOTEN select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR +config BOARD_GOOGLE_DIBBI + bool "-> Dibbi" + select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50 + config BOARD_GOOGLE_DEDEDE bool "-> Dedede" select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50 diff --git a/src/mainboard/google/dedede/variants/dibbi/include/variant/ec.h b/src/mainboard/google/dedede/variants/dibbi/include/variant/ec.h new file mode 100644 index 0000000000..08870e0627 --- /dev/null +++ b/src/mainboard/google/dedede/variants/dibbi/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/dibbi/include/variant/gpio.h b/src/mainboard/google/dedede/variants/dibbi/include/variant/gpio.h new file mode 100644 index 0000000000..9078664608 --- /dev/null +++ b/src/mainboard/google/dedede/variants/dibbi/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/dibbi/memory/Makefile.inc b/src/mainboard/google/dedede/variants/dibbi/memory/Makefile.inc new file mode 100644 index 0000000000..eace2e443e --- /dev/null +++ b/src/mainboard/google/dedede/variants/dibbi/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/dedede/variants/dibbi/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/dibbi/memory/dram_id.generated.txt new file mode 100644 index 0000000000..fa247902ee --- /dev/null +++ b/src/mainboard/google/dedede/variants/dibbi/memory/dram_id.generated.txt @@ -0,0 +1 @@ +DRAM Part Name ID to assign diff --git a/src/mainboard/google/dedede/variants/dibbi/memory/mem_parts_used.txt b/src/mainboard/google/dedede/variants/dibbi/memory/mem_parts_used.txt new file mode 100644 index 0000000000..96211370d9 --- /dev/null +++ b/src/mainboard/google/dedede/variants/dibbi/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/dedede/variants/dibbi/overridetree.cb b/src/mainboard/google/dedede/variants/dibbi/overridetree.cb new file mode 100644 index 0000000000..404024b1d6 --- /dev/null +++ b/src/mainboard/google/dedede/variants/dibbi/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