aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2024-04-13 09:42:39 -0500
committerFelix Held <felix-coreboot@felixheld.de>2024-04-15 13:36:54 +0000
commitc5d191b2920f56dc15ed17d7909f7f7f4b41fad1 (patch)
tree229f5b04d136cb22e673ba54eda06b03db53cd1c /src
parentdb3fe7e8ff4d031a63e3a2954f3706ac5aed96ee (diff)
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 <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/81901 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/google/fizz/Makefile.mk2
-rw-r--r--src/mainboard/google/fizz/variants/endeavour/gma-mainboard.ads (renamed from src/mainboard/google/fizz/gma-mainboard.ads)0
-rw-r--r--src/mainboard/google/fizz/variants/fizz/gma-mainboard.ads18
-rw-r--r--src/mainboard/google/fizz/variants/karma/gma-mainboard.ads19
4 files changed, 38 insertions, 1 deletions
diff --git a/src/mainboard/google/fizz/Makefile.mk b/src/mainboard/google/fizz/Makefile.mk
index e192cffd3d..6c20356bb6 100644
--- a/src/mainboard/google/fizz/Makefile.mk
+++ b/src/mainboard/google/fizz/Makefile.mk
@@ -11,7 +11,7 @@ ramstage-$(CONFIG_CHROMEOS) += chromeos.c
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
index ae2708cf2d..ae2708cf2d 100644
--- a/src/mainboard/google/fizz/gma-mainboard.ads
+++ b/src/mainboard/google/fizz/variants/endeavour/gma-mainboard.ads
diff --git a/src/mainboard/google/fizz/variants/fizz/gma-mainboard.ads b/src/mainboard/google/fizz/variants/fizz/gma-mainboard.ads
new file mode 100644
index 0000000000..ae2708cf2d
--- /dev/null
+++ b/src/mainboard/google/fizz/variants/fizz/gma-mainboard.ads
@@ -0,0 +1,18 @@
+-- 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 :=
+ (DP1,
+ DP2,
+ HDMI1,
+ HDMI2,
+ others => Disabled);
+
+end GMA.Mainboard;
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 0000000000..fcfbd75a92
--- /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;