From 6711731818d0b0fd246bbecb5be9d64671fbd6eb Mon Sep 17 00:00:00 2001 From: Tarun Tuli Date: Thu, 4 May 2023 12:29:38 +0000 Subject: mb/google/brya: Split gma-mainboards for different baseboards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/74696 Tested-by: build bot (Jenkins) Reviewed-by: Subrata Banik Reviewed-by: Jérémy Compostella --- src/mainboard/google/brya/Makefile.inc | 1 - src/mainboard/google/brya/gma-mainboard.ads | 13 ------------- .../google/brya/variants/baseboard/brask/Makefile.inc | 1 + .../brya/variants/baseboard/brask/gma-mainboard-ads | 15 +++++++++++++++ .../google/brya/variants/baseboard/brya/Makefile.inc | 1 + .../google/brya/variants/baseboard/brya/gma-mainboard.ads | 13 +++++++++++++ 6 files changed, 30 insertions(+), 14 deletions(-) delete mode 100644 src/mainboard/google/brya/gma-mainboard.ads create mode 100644 src/mainboard/google/brya/variants/baseboard/brask/gma-mainboard-ads create mode 100644 src/mainboard/google/brya/variants/baseboard/brya/gma-mainboard.ads (limited to 'src/mainboard/google/brya') 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/gma-mainboard.ads b/src/mainboard/google/brya/gma-mainboard.ads deleted file mode 100644 index 3b02f14d95..0000000000 --- a/src/mainboard/google/brya/gma-mainboard.ads +++ /dev/null @@ -1,13 +0,0 @@ --- 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, - others => Disabled); -end GMA.Mainboard; 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/variants/baseboard/brya/gma-mainboard.ads b/src/mainboard/google/brya/variants/baseboard/brya/gma-mainboard.ads new file mode 100644 index 0000000000..3b02f14d95 --- /dev/null +++ b/src/mainboard/google/brya/variants/baseboard/brya/gma-mainboard.ads @@ -0,0 +1,13 @@ +-- 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, + others => Disabled); +end GMA.Mainboard; -- cgit v1.2.3