[coreboot-gerrit] Change in coreboot[master]: mb/sapphire/pureplatinumh61: Update GMA config

[Martin Roth (Code Review)]

Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/19353 )

Change subject: mb/sapphire/pureplatinumh61: Update GMA config
......................................................................


mb/sapphire/pureplatinumh61: Update GMA config

This board was added while the latest libgfxinit changes were in review.
Update to make it compile again and sanitize the port list.

Change-Id: I81b96e225945a8f8e47b64cefea91eb2747675ca
Signed-off-by: Nico Huber <nico.h at gmx.de>
Reviewed-on: https://review.coreboot.org/19353
Tested-by: build bot (Jenkins)
Reviewed-by: Nicola Corna <nicola at corna.info>
---
M src/mainboard/sapphire/pureplatinumh61/Kconfig
M src/mainboard/sapphire/pureplatinumh61/gma-mainboard.ads
2 files changed, 12 insertions(+), 7 deletions(-)

Approvals:
  Nicola Corna: Looks good to me, approved
  build bot (Jenkins): Verified



diff --git a/src/mainboard/sapphire/pureplatinumh61/Kconfig b/src/mainboard/sapphire/pureplatinumh61/Kconfig
index c01a524..937e7e4 100644
--- a/src/mainboard/sapphire/pureplatinumh61/Kconfig
+++ b/src/mainboard/sapphire/pureplatinumh61/Kconfig
@@ -14,6 +14,7 @@
 	select HAVE_CMOS_DEFAULT
 	select HAVE_ACPI_RESUME
 	select MAINBOARD_HAS_LIBGFXINIT
+	select MAINBOARD_USE_LIBGFXINIT if MAINBOARD_DO_NATIVE_VGA_INIT
 	select INTEL_INT15
 	select UDELAY_TSC
 	select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/sapphire/pureplatinumh61/gma-mainboard.ads b/src/mainboard/sapphire/pureplatinumh61/gma-mainboard.ads
index cf86617..9b402b1 100644
--- a/src/mainboard/sapphire/pureplatinumh61/gma-mainboard.ads
+++ b/src/mainboard/sapphire/pureplatinumh61/gma-mainboard.ads
@@ -1,21 +1,25 @@
 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
 
    -- For a three-pipe setup, bandwidth is shared between the 2nd and
-   -- the 3rd pipe (if it's not eDP). Thus, probe ports that likely
-   -- have a high-resolution display attached first, `Internal` last.
+   -- the 3rd pipe. Thus, probe ports that likely have a high-resolution
+   -- display attached first.
 
+   -- FIXME: Only one of the digital ports is implemented as DP
+   --        but it's unknown which.
    ports : constant Port_List :=
-     (DP2,
+     (DP1,
+      DP2,
       DP3,
-      Digital1,
-      Digital2,
-      Digital3,
+      HDMI1,
+      HDMI2,
+      HDMI3,
       Analog,
-      Internal,
       others => Disabled);
 
 end GMA.Mainboard;

-- 
To view, visit https://review.coreboot.org/19353
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I81b96e225945a8f8e47b64cefea91eb2747675ca
Gerrit-PatchSet: 2
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Nico Huber <nico.h at gmx.de>
Gerrit-Reviewer: Martin Roth <martinroth at google.com>
Gerrit-Reviewer: Nico Huber <nico.h at gmx.de>
Gerrit-Reviewer: Nicola Corna <nicola at corna.info>
Gerrit-Reviewer: Paul Menzel <paulepanter at users.sourceforge.net>
Gerrit-Reviewer: build bot (Jenkins)