diff options
| author | Jon Murphy <jpmurphy@google.com> | 2023-03-29 15:36:01 -0600 |
|---|---|---|
| committer | Raul Rangel <rrangel@chromium.org> | 2023-04-11 20:21:00 +0000 |
| commit | 3f34879e2800d0d599331b2a5a068582f6f39b28 (patch) | |
| tree | 487829340b15aa867da033af8a314c4c479053aa | |
| parent | 2e9f0d3b6aa754dc71cd36086d1eb2a839bdb7bd (diff) | |
mb/google/myst: Enable variants for Myst
BUG=b:270618107
TEST=builds
Signed-off-by: Jon Murphy <jpmurphy@google.com>
Change-Id: I688e9c2fdf203cecfd5f200dec6cde9dbc0a9aa7
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74098
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
| -rw-r--r-- | src/mainboard/google/myst/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/google/myst/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/mainboard/google/myst/mainboard.c | 3 | ||||
| -rw-r--r-- | src/mainboard/google/myst/variants/myst/include/variant/ec.h | 3 | ||||
| -rw-r--r-- | src/mainboard/google/myst/variants/myst/overridetree.cb | 4 |
5 files changed, 19 insertions, 1 deletions
diff --git a/src/mainboard/google/myst/Kconfig b/src/mainboard/google/myst/Kconfig index b9e87fb678..6537cceac5 100644 --- a/src/mainboard/google/myst/Kconfig +++ b/src/mainboard/google/myst/Kconfig @@ -27,6 +27,14 @@ config MAINBOARD_FAMILY config MAINBOARD_PART_NUMBER default "Myst" if BOARD_GOOGLE_MYST +config OVERRIDE_DEVICETREE + string + default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" + +config VARIANT_DIR + string + default "myst" if BOARD_GOOGLE_MYST + config VBOOT select VBOOT_NO_BOARD_SUPPORT select VBOOT_SEPARATE_VERSTAGE diff --git a/src/mainboard/google/myst/Makefile.inc b/src/mainboard/google/myst/Makefile.inc index 5bd6acab7e..9060a730ed 100644 --- a/src/mainboard/google/myst/Makefile.inc +++ b/src/mainboard/google/myst/Makefile.inc @@ -9,5 +9,7 @@ ramstage-y += port_descriptors.c ramstage-$(CONFIG_CHROMEOS) += chromeos.c subdirs-y += variants/baseboard +subdirs-y += variants/$(VARIANT_DIR) CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/myst/mainboard.c b/src/mainboard/google/myst/mainboard.c index bba9fc2dbb..56329ee128 100644 --- a/src/mainboard/google/myst/mainboard.c +++ b/src/mainboard/google/myst/mainboard.c @@ -2,6 +2,7 @@ #include <amdblocks/amd_pci_util.h> #include <baseboard/variants.h> +#include <console/console.h> #include <device/device.h> static const struct fch_irq_routing fch_irq_map[] = { @@ -33,7 +34,7 @@ static void mainboard_init(void *chip_info) static void mainboard_enable(struct device *dev) { - /* TODO(b/270618107): Enable mainboard */ + printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); } struct chip_operations mainboard_ops = { diff --git a/src/mainboard/google/myst/variants/myst/include/variant/ec.h b/src/mainboard/google/myst/variants/myst/include/variant/ec.h new file mode 100644 index 0000000000..9e61a440cf --- /dev/null +++ b/src/mainboard/google/myst/variants/myst/include/variant/ec.h @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include <baseboard/ec.h> diff --git a/src/mainboard/google/myst/variants/myst/overridetree.cb b/src/mainboard/google/myst/variants/myst/overridetree.cb new file mode 100644 index 0000000000..164a47ad7f --- /dev/null +++ b/src/mainboard/google/myst/variants/myst/overridetree.cb @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +chip soc/amd/phoenix + device domain 0 on end # domain +end # chip soc/amd/phoenix |