Patrick Georgi submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Kyösti Mälkki: Looks good to me, but someone else must approve Paul Menzel: Looks good to me, but someone else must approve Angel Pons: Looks good to me, approved
mb/lenovo/t400: Move `gma-mainboard.ads` to variants

Some board revisions have the straps for display port detection
wrongly configured. So with a single list covering all variants'
possible outputs, we make libgfxinit probe unimplemented ports
which may stall the GMBUS controller and delay the boot for some
hundred milliseconds.

This just copies the list to the various variants with different
display ports, so we can test the actual changes individually.

Change-Id: I48cdea1d71d9553b6bdbce432eae986996329239
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38571
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
M src/mainboard/lenovo/t400/Makefile.inc
R src/mainboard/lenovo/t400/variants/r500/gma-mainboard.ads
C src/mainboard/lenovo/t400/variants/t400/coronado-5/gma-mainboard.ads
C src/mainboard/lenovo/t400/variants/t400/malibu-3/gma-mainboard.ads
4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/mainboard/lenovo/t400/Makefile.inc b/src/mainboard/lenovo/t400/Makefile.inc
index e4e6a1f..5d5669e 100644
--- a/src/mainboard/lenovo/t400/Makefile.inc
+++ b/src/mainboard/lenovo/t400/Makefile.inc
@@ -22,4 +22,10 @@
ramstage-y += cstates.c
ramstage-y += blc.c

-ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+ifeq ($(CONFIG_MAINBOARD_USE_LIBGFXINIT),y)
+ramstage-$(CONFIG_BOARD_LENOVO_T400) += variants/t400/malibu-3/gma-mainboard.ads
+ramstage-$(CONFIG_BOARD_LENOVO_R400) += variants/t400/malibu-3/gma-mainboard.ads
+ramstage-$(CONFIG_BOARD_LENOVO_T500) += variants/t400/coronado-5/gma-mainboard.ads
+ramstage-$(CONFIG_BOARD_LENOVO_W500) += variants/t400/coronado-5/gma-mainboard.ads
+ramstage-$(CONFIG_BOARD_LENOVO_R500) += variants/r500/gma-mainboard.ads
+endif
diff --git a/src/mainboard/lenovo/t400/gma-mainboard.ads b/src/mainboard/lenovo/t400/variants/r500/gma-mainboard.ads
similarity index 100%
rename from src/mainboard/lenovo/t400/gma-mainboard.ads
rename to src/mainboard/lenovo/t400/variants/r500/gma-mainboard.ads
diff --git a/src/mainboard/lenovo/t400/gma-mainboard.ads b/src/mainboard/lenovo/t400/variants/t400/coronado-5/gma-mainboard.ads
similarity index 100%
copy from src/mainboard/lenovo/t400/gma-mainboard.ads
copy to src/mainboard/lenovo/t400/variants/t400/coronado-5/gma-mainboard.ads
diff --git a/src/mainboard/lenovo/t400/gma-mainboard.ads b/src/mainboard/lenovo/t400/variants/t400/malibu-3/gma-mainboard.ads
similarity index 100%
copy from src/mainboard/lenovo/t400/gma-mainboard.ads
copy to src/mainboard/lenovo/t400/variants/t400/malibu-3/gma-mainboard.ads

To view, visit change 38571. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I48cdea1d71d9553b6bdbce432eae986996329239
Gerrit-Change-Number: 38571
Gerrit-PatchSet: 3
Gerrit-Owner: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: Alexander Couzens <lynxis@fe80.eu>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Bill XIE <persmule@hardenedlinux.org>
Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki@gmail.com>
Gerrit-Reviewer: Martin Roth <martinroth@google.com>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>
Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org>
Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-Reviewer: Swift Geek (Sebastian Grzywna) <swiftgeek@gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged