[coreboot-gerrit] Change in coreboot[master]: mb/amd/mandolin: make mandolin a variant of itself

[Felix Held (Code Review)]

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42785 )

Change subject: mb/amd/mandolin: make mandolin a variant of itself
......................................................................

mb/amd/mandolin: make mandolin a variant of itself

A follow-up patch will add Cereme which is a Mandolin variant.

TEST=Mandolin still boots into Linux live system.

Change-Id: Ifee91306756f8a4152a6a0224e172dae7eac8f7a
Signed-off-by: Felix Held 
---
M src/mainboard/amd/mandolin/Kconfig
M src/mainboard/amd/mandolin/Makefile.inc
R src/mainboard/amd/mandolin/variants/mandolin/board.fmd
R src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb
R src/mainboard/amd/mandolin/variants/mandolin/port_descriptors.c
5 files changed, 15 insertions(+), 7 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/42785/1

diff --git a/src/mainboard/amd/mandolin/Kconfig b/src/mainboard/amd/mandolin/Kconfig
index 49a8ece..8c37ef5 100644
--- a/src/mainboard/amd/mandolin/Kconfig
+++ b/src/mainboard/amd/mandolin/Kconfig
@@ -7,13 +7,13 @@
    select SOC_AMD_COMMON_BLOCK_USE_ESPI
    select SOC_AMD_PICASSO
    select HAVE_ACPI_TABLES
-	select BOARD_ROMSIZE_KB_8192
+	select BOARD_ROMSIZE_KB_8192 if BOARD_AMD_MANDOLIN
    select AZALIA_PLUGIN_SUPPORT
    select HAVE_ACPI_RESUME

config FMDFILE
    string
-	default "src/mainboard/amd/mandolin/mandolin.fmd"
+	default "src/mainboard/amd/mandolin/variants/$(CONFIG_VARIANT_DIR)/board.fmd"

config AMD_LPC_DEBUG_CARD
    bool "Enable LPC-Serial debug card on the debug header"
@@ -28,15 +28,23 @@

config CBFS_SIZE
    hex
-	default 0x7cf000 # Maximum size for the Mandolin FMAP
+	default 0x7cf000 if BOARD_AMD_MANDOLIN # Maximum size for the Mandolin FMAP

config MAINBOARD_DIR
    string
    default amd/mandolin

+config VARIANT_DIR
+	string
+	default "mandolin" if BOARD_AMD_MANDOLIN
+
 config MAINBOARD_PART_NUMBER
    string
-	default "MANDOLIN"
+	default "MANDOLIN" if BOARD_AMD_MANDOLIN
+
+config DEVICETREE
+	string
+	default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"

config MAX_CPUS
    int
@@ -48,7 +56,7 @@

config AMD_FWM_POSITION_INDEX
    int
-	default 3
+	default 3 if BOARD_AMD_MANDOLIN
    help
      TODO: might need to be adapted for better placement of files in cbfs

@@ -96,6 +104,6 @@

config VGA_BIOS_DGPU_FILE
    string
-	default "3rdparty/amd_blobs/picasso/PicassoGenericVbios.bin"
+	default "3rdparty/amd_blobs/picasso/PicassoGenericVbios.bin" if BOARD_AMD_MANDOLIN

endif # BOARD_AMD_MANDOLIN
diff --git a/src/mainboard/amd/mandolin/Makefile.inc b/src/mainboard/amd/mandolin/Makefile.inc
index 56dd5e2..7bc176a 100644
--- a/src/mainboard/amd/mandolin/Makefile.inc
+++ b/src/mainboard/amd/mandolin/Makefile.inc
@@ -4,7 +4,7 @@
 bootblock-y += early_gpio.c

ramstage-y += gpio.c
-ramstage-y += port_descriptors.c
+ramstage-y += variants/$(VARIANT_DIR)/port_descriptors.c

# APCB_mandolin.bin
 APCB_SOURCES = mandolin
diff --git a/src/mainboard/amd/mandolin/mandolin.fmd b/src/mainboard/amd/mandolin/variants/mandolin/board.fmd
similarity index 100%
rename from src/mainboard/amd/mandolin/mandolin.fmd
rename to src/mainboard/amd/mandolin/variants/mandolin/board.fmd
diff --git a/src/mainboard/amd/mandolin/devicetree.cb b/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb
similarity index 100%
rename from src/mainboard/amd/mandolin/devicetree.cb
rename to src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb
diff --git a/src/mainboard/amd/mandolin/port_descriptors.c b/src/mainboard/amd/mandolin/variants/mandolin/port_descriptors.c
similarity index 100%
rename from src/mainboard/amd/mandolin/port_descriptors.c
rename to src/mainboard/amd/mandolin/variants/mandolin/port_descriptors.c