commit 86a2324ee0c48b7fa5f02deea78db73d72b5381b
author Mathew King <mathewk@chromium.org> Wed Feb 17 09:57:36 2021 -0700
committer Patrick Georgi <pgeorgi@google.com> Mon Feb 22 07:28:26 2021 +0000
tree 75c9c54f88f535447d10e16438e861b0042b61e7
parent 5d478879656b62cc56e0b0fe1f57e35b318e6624

mb/google/guybrush: Enable guybrush variant

Enable the building of guybrush variants and configure the first variant
also called guybrush.

BUG=b:180419462
TEST=builds

Signed-off-by: Mathew King <mathewk@chromium.org>
Change-Id: I3bed620378f9152277b4943ead1017f61a21ea82
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50845
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/mainboard/google/guybrush/Kconfig

diff --git a/src/mainboard/google/guybrush/Kconfig b/src/mainboard/google/guybrush/Kconfig
index 4e6e21c..e96b4dc 100644
--- a/src/mainboard/google/guybrush/Kconfig
+++ b/src/mainboard/google/guybrush/Kconfig
@@ -38,10 +38,18 @@
 	help
 	  TODO: might need to be adapted for better placement of files in cbfs
 
+config VARIANT_DIR
+	string
+	default "guybrush" if BOARD_GOOGLE_GUYBRUSH
+
 config DEVICETREE
 	string
 	default "variants/baseboard/devicetree.cb"
 
+config OVERRIDE_DEVICETREE
+	string
+	default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
+
 config MAINBOARD_FAMILY
 	string
 	default "Google_Guybrush"

src/mainboard/google/guybrush/Makefile.inc

diff --git a/src/mainboard/google/guybrush/Makefile.inc b/src/mainboard/google/guybrush/Makefile.inc
index d16a874..7d2b135 100644
--- a/src/mainboard/google/guybrush/Makefile.inc
+++ b/src/mainboard/google/guybrush/Makefile.inc
@@ -6,4 +6,7 @@
 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

src/mainboard/google/guybrush/variants/guybrush/overridetree.cb

diff --git a/src/mainboard/google/guybrush/variants/guybrush/overridetree.cb b/src/mainboard/google/guybrush/variants/guybrush/overridetree.cb
new file mode 100644
index 0000000..519bd07
--- /dev/null
+++ b/src/mainboard/google/guybrush/variants/guybrush/overridetree.cb
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+chip soc/amd/cezanne
+	device domain 0 on
+	end # domain
+end	# chip soc/amd/cezanne