diff options
author | Tarun Tuli <taruntuli@google.com> | 2023-05-04 12:29:38 +0000 |
---|---|---|
committer | Felix Held <felix-coreboot@felixheld.de> | 2023-05-08 13:13:06 +0000 |
commit | 6711731818d0b0fd246bbecb5be9d64671fbd6eb (patch) | |
tree | f799d90b32d01a118638ebe9ae847072ee724315 /src | |
parent | af879f2d34207b99bbb62e49a6e1bdcec4e217f4 (diff) |
mb/google/brya: Split gma-mainboards for different baseboards
Allow different gma-mainboards configs for different baseboards
as they support varying display interfaces. Set Brya to eDP only
and Brask to HDMI only.
BUG=b:277861633
BRANCH=firmware-brya-14505.B
TEST=Builds and SoL functions on both brya and brask varaints
Change-Id: Iaf3f35b009d53e50723e4aa82c0f4932783f9bb9
Signed-off-by: Tarun Tuli <taruntuli@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74696
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Jérémy Compostella <jeremy.compostella@intel.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/mainboard/google/brya/Makefile.inc | 1 | ||||
-rw-r--r-- | src/mainboard/google/brya/variants/baseboard/brask/Makefile.inc | 1 | ||||
-rw-r--r-- | src/mainboard/google/brya/variants/baseboard/brask/gma-mainboard-ads | 15 | ||||
-rw-r--r-- | src/mainboard/google/brya/variants/baseboard/brya/Makefile.inc | 1 | ||||
-rw-r--r-- | src/mainboard/google/brya/variants/baseboard/brya/gma-mainboard.ads (renamed from src/mainboard/google/brya/gma-mainboard.ads) | 0 |
5 files changed, 17 insertions, 1 deletions
diff --git a/src/mainboard/google/brya/Makefile.inc b/src/mainboard/google/brya/Makefile.inc index dc7f93a96f..b98c3ee87c 100644 --- a/src/mainboard/google/brya/Makefile.inc +++ b/src/mainboard/google/brya/Makefile.inc @@ -4,7 +4,6 @@ verstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-y += romstage.c -romstage-$(CONFIG_MAINBOARD_USE_EARLY_LIBGFXINIT) += gma-mainboard.ads ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += mainboard.c diff --git a/src/mainboard/google/brya/variants/baseboard/brask/Makefile.inc b/src/mainboard/google/brya/variants/baseboard/brask/Makefile.inc index 53aaa41148..8121d7e3ae 100644 --- a/src/mainboard/google/brya/variants/baseboard/brask/Makefile.inc +++ b/src/mainboard/google/brya/variants/baseboard/brask/Makefile.inc @@ -1,6 +1,7 @@ bootblock-y += gpio.c romstage-y += memory.c +romstage-$(CONFIG_MAINBOARD_USE_EARLY_LIBGFXINIT) += gma-mainboard.ads romstage-y += gpio.c ramstage-y += gpio.c diff --git a/src/mainboard/google/brya/variants/baseboard/brask/gma-mainboard-ads b/src/mainboard/google/brya/variants/baseboard/brask/gma-mainboard-ads new file mode 100644 index 0000000000..53a99b4d00 --- /dev/null +++ b/src/mainboard/google/brya/variants/baseboard/brask/gma-mainboard-ads @@ -0,0 +1,15 @@ +-- 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 := + ( HDMI1, + HDMI2, + HDMI3, + others => Disabled); +end GMA.Mainboard; diff --git a/src/mainboard/google/brya/variants/baseboard/brya/Makefile.inc b/src/mainboard/google/brya/variants/baseboard/brya/Makefile.inc index 53aaa41148..f2efc1de30 100644 --- a/src/mainboard/google/brya/variants/baseboard/brya/Makefile.inc +++ b/src/mainboard/google/brya/variants/baseboard/brya/Makefile.inc @@ -2,6 +2,7 @@ bootblock-y += gpio.c romstage-y += memory.c romstage-y += gpio.c +romstage-$(CONFIG_MAINBOARD_USE_EARLY_LIBGFXINIT) += gma-mainboard.ads ramstage-y += gpio.c ramstage-y += ramstage.c diff --git a/src/mainboard/google/brya/gma-mainboard.ads b/src/mainboard/google/brya/variants/baseboard/brya/gma-mainboard.ads index 3b02f14d95..3b02f14d95 100644 --- a/src/mainboard/google/brya/gma-mainboard.ads +++ b/src/mainboard/google/brya/variants/baseboard/brya/gma-mainboard.ads |