From c5d191b2920f56dc15ed17d7909f7f7f4b41fad1 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sat, 13 Apr 2024 09:42:39 -0500 Subject: [PATCH] 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 --- src/mainboard/google/fizz/Makefile.mk | 2 +- .../endeavour}/gma-mainboard.ads | 0 .../fizz/variants/fizz/gma-mainboard.ads | 18 ++++++++++++++++++ .../fizz/variants/karma/gma-mainboard.ads | 19 +++++++++++++++++++ 4 files changed, 38 insertions(+), 1 deletion(-) rename src/mainboard/google/fizz/{ => variants/endeavour}/gma-mainboard.ads (100%) create mode 100644 src/mainboard/google/fizz/variants/fizz/gma-mainboard.ads create mode 100644 src/mainboard/google/fizz/variants/karma/gma-mainboard.ads 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 similarity index 100% rename from src/mainboard/google/fizz/gma-mainboard.ads rename to 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;