From e6b3168ff1698bbfc82b6159b9aa86200cbb82da Mon Sep 17 00:00:00 2001 From: Eric Lai Date: Tue, 9 Mar 2021 13:34:43 +0800 Subject: [PATCH] mb/google/mancomb: Enable mancomb variant BUG=b:182211161 TEST=builds Signed-off-by: Eric Lai Change-Id: I554e7193494a4bbf005aaf2fb4efd6ded383fe07 Reviewed-on: https://review.coreboot.org/c/coreboot/+/51369 Tested-by: build bot (Jenkins) Reviewed-by: Mathew King --- src/mainboard/google/mancomb/Kconfig | 8 ++++++++ src/mainboard/google/mancomb/Makefile.inc | 3 +++ .../google/mancomb/variants/mancomb/overridetree.cb | 4 ++++ 3 files changed, 15 insertions(+) create mode 100644 src/mainboard/google/mancomb/variants/mancomb/overridetree.cb diff --git a/src/mainboard/google/mancomb/Kconfig b/src/mainboard/google/mancomb/Kconfig index 3fbe75287d..0e4a49fc37 100644 --- a/src/mainboard/google/mancomb/Kconfig +++ b/src/mainboard/google/mancomb/Kconfig @@ -39,10 +39,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 "mancomb" if BOARD_GOOGLE_MANCOMB + 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_Mancomb" diff --git a/src/mainboard/google/mancomb/Makefile.inc b/src/mainboard/google/mancomb/Makefile.inc index d16a87420d..7d2b1355ad 100644 --- a/src/mainboard/google/mancomb/Makefile.inc +++ b/src/mainboard/google/mancomb/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/mancomb/variants/mancomb/overridetree.cb b/src/mainboard/google/mancomb/variants/mancomb/overridetree.cb new file mode 100644 index 0000000000..eae9425bf7 --- /dev/null +++ b/src/mainboard/google/mancomb/variants/mancomb/overridetree.cb @@ -0,0 +1,4 @@ +chip soc/amd/cezanne + device domain 0 on + end # domain +end # chip soc/amd/cezanne