[S] Change in coreboot[main]: mb/google/fizz: Use variant-specific gma-mainboard.ads files

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/81901?usp=email )

Change subject: mb/google/fizz: Use variant-specific gma-mainboard.ads files
......................................................................

mb/google/fizz: Use variant-specific gma-mainboard.ads files

The karma variant, being a Chromebase, has an internal eDP output for
the built-in display whereas the fizz/endeavour variants do not. Use
separate gma-mainboard.ads files so that karma's internal panel works
properly with libgfxinit.

TEST=build google/fizz (fizz/karma) with libgfxinit enabled, ensure
correct gma-mainboard.ads file is included in the build.

Change-Id: Ia6aca538ba8c13b48aa80901222071d704b5f0c0
Signed-off-by: Matt DeVillier 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/81901
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
---
M src/mainboard/google/fizz/Makefile.mk
C src/mainboard/google/fizz/variants/endeavour/gma-mainboard.ads
R src/mainboard/google/fizz/variants/fizz/gma-mainboard.ads
A src/mainboard/google/fizz/variants/karma/gma-mainboard.ads
4 files changed, 20 insertions(+), 1 deletion(-)

Approvals:
  Angel Pons: Looks good to me, approved
  build bot (Jenkins): Verified

diff --git a/src/mainboard/google/fizz/Makefile.mk b/src/mainboard/google/fizz/Makefile.mk
index e192cff..6c20356 100644
--- a/src/mainboard/google/fizz/Makefile.mk
+++ b/src/mainboard/google/fizz/Makefile.mk
@@ -11,7 +11,7 @@
 ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
 ramstage-y += mainboard.c

-ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads

subdirs-y += variants/baseboard
 CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
diff --git a/src/mainboard/google/fizz/gma-mainboard.ads b/src/mainboard/google/fizz/variants/endeavour/gma-mainboard.ads
similarity index 100%
copy from src/mainboard/google/fizz/gma-mainboard.ads
copy to src/mainboard/google/fizz/variants/endeavour/gma-mainboard.ads
diff --git a/src/mainboard/google/fizz/gma-mainboard.ads b/src/mainboard/google/fizz/variants/fizz/gma-mainboard.ads
similarity index 100%
rename from src/mainboard/google/fizz/gma-mainboard.ads
rename to src/mainboard/google/fizz/variants/fizz/gma-mainboard.ads
diff --git a/src/mainboard/google/fizz/variants/karma/gma-mainboard.ads b/src/mainboard/google/fizz/variants/karma/gma-mainboard.ads
new file mode 100644
index 0000000..fcfbd75
--- /dev/null
+++ b/src/mainboard/google/fizz/variants/karma/gma-mainboard.ads
@@ -0,0 +1,19 @@
+-- SPDX-License-Identifier: GPL-2.0-or-later
+
+with HW.GFX.GMA;
+with HW.GFX.GMA.Display_Probing;
+
+use HW.GFX.GMA;
+use HW.GFX.GMA.Display_Probing;
+
+private package GMA.Mainboard is
+
+   ports : constant Port_List :=
+     (eDP,
+      DP1,
+      DP2,
+      HDMI1,
+      HDMI2,
+      others => Disabled);
+
+end GMA.Mainboard;