aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathew King <mathewk@chromium.org>2021-02-17 09:57:36 -0700
committerPatrick Georgi <pgeorgi@google.com>2021-02-22 07:28:26 +0000
commit86a2324ee0c48b7fa5f02deea78db73d72b5381b (patch)
tree75c9c54f88f535447d10e16438e861b0042b61e7
parent5d478879656b62cc56e0b0fe1f57e35b318e6624 (diff)
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>
-rw-r--r--src/mainboard/google/guybrush/Kconfig8
-rw-r--r--src/mainboard/google/guybrush/Makefile.inc3
-rw-r--r--src/mainboard/google/guybrush/variants/guybrush/overridetree.cb5
3 files changed, 16 insertions, 0 deletions
diff --git a/src/mainboard/google/guybrush/Kconfig b/src/mainboard/google/guybrush/Kconfig
index 4e6e21ca03..e96b4dcf5f 100644
--- a/src/mainboard/google/guybrush/Kconfig
+++ b/src/mainboard/google/guybrush/Kconfig
@@ -38,10 +38,18 @@ config AMD_FWM_POSITION_INDEX
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"
diff --git a/src/mainboard/google/guybrush/Makefile.inc b/src/mainboard/google/guybrush/Makefile.inc
index d16a87420d..7d2b1355ad 100644
--- a/src/mainboard/google/guybrush/Makefile.inc
+++ b/src/mainboard/google/guybrush/Makefile.inc
@@ -6,4 +6,7 @@ ramstage-y += mainboard.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/guybrush/variants/guybrush/overridetree.cb b/src/mainboard/google/guybrush/variants/guybrush/overridetree.cb
new file mode 100644
index 0000000000..519bd07fab
--- /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