12 files changed, 15 insertions, 12 deletions
diff --git a/src/mainboard/google/auron/gma-mainboard.ads b/src/mainboard/google/auron/gma-mainboard.ads
index d110261be2..79ca0075f2 100644
--- a/src/mainboard/google/auron/gma-mainboard.ads
+++ b/src/mainboard/google/auron/gma-mainboard.ads
@@ -21,7 +21,7 @@ use HW.GFX.GMA.Display_Probing;
 private package GMA.Mainboard is
 
    ports : constant Port_List :=
-     (Internal,
+     (eDP,
       HDMI1,
       DP1,
       DP2,
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index 33a840fd83..4e014558ca 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -18,7 +18,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SERIRQ_CONTINUOUS_MODE	# Workaround for EC/KBC IRQ1.
 	select HAVE_IFD_BIN
 	select HAVE_ME_BIN
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select MAINBOARD_HAS_LIBGFXINIT
 	select SANDYBRIDGE_VBOOT_IN_ROMSTAGE
 
diff --git a/src/mainboard/google/butterfly/gma-mainboard.ads b/src/mainboard/google/butterfly/gma-mainboard.ads
index e45320f36e..105b231e4f 100644
--- a/src/mainboard/google/butterfly/gma-mainboard.ads
+++ b/src/mainboard/google/butterfly/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/google/eve/gma-mainboard.ads b/src/mainboard/google/eve/gma-mainboard.ads
index 87cdb5e7c0..52f6783ddb 100644
--- a/src/mainboard/google/eve/gma-mainboard.ads
+++ b/src/mainboard/google/eve/gma-mainboard.ads
@@ -21,7 +21,7 @@ use HW.GFX.GMA.Display_Probing;
 private package GMA.Mainboard is
 
    ports : constant Port_List :=
-     (Internal,
+     (eDP,
       DP1,
       DP2,
       HDMI1,
diff --git a/src/mainboard/google/glados/gma-mainboard.ads b/src/mainboard/google/glados/gma-mainboard.ads
index 87cdb5e7c0..52f6783ddb 100644
--- a/src/mainboard/google/glados/gma-mainboard.ads
+++ b/src/mainboard/google/glados/gma-mainboard.ads
@@ -21,7 +21,7 @@ use HW.GFX.GMA.Display_Probing;
 private package GMA.Mainboard is
 
    ports : constant Port_List :=
-     (Internal,
+     (eDP,
       DP1,
       DP2,
       HDMI1,
diff --git a/src/mainboard/google/link/gma-mainboard.ads b/src/mainboard/google/link/gma-mainboard.ads
index 41737255a6..fae0b5b06e 100644
--- a/src/mainboard/google/link/gma-mainboard.ads
+++ b/src/mainboard/google/link/gma-mainboard.ads
@@ -17,7 +17,7 @@ use HW.GFX.GMA.Display_Probing;
 private package GMA.Mainboard is
 
    ports : constant Port_List :=
-     (Internal,
+     (eDP,
       DP3,
       HDMI3,
       others => Disabled);
diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig
index c5b680c89b..4afd76110e 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -19,7 +19,7 @@ config BOARD_SPECIFIC_OPTIONS
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE
 	# This board also feature sandy-bridge CPU's so must have LVDS
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select MAINBOARD_HAS_LIBGFXINIT
 	select SANDYBRIDGE_VBOOT_IN_ROMSTAGE
 
diff --git a/src/mainboard/google/parrot/gma-mainboard.ads b/src/mainboard/google/parrot/gma-mainboard.ads
index e45320f36e..105b231e4f 100644
--- a/src/mainboard/google/parrot/gma-mainboard.ads
+++ b/src/mainboard/google/parrot/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/google/poppy/gma-mainboard.ads b/src/mainboard/google/poppy/gma-mainboard.ads
index 87cdb5e7c0..52f6783ddb 100644
--- a/src/mainboard/google/poppy/gma-mainboard.ads
+++ b/src/mainboard/google/poppy/gma-mainboard.ads
@@ -21,7 +21,7 @@ use HW.GFX.GMA.Display_Probing;
 private package GMA.Mainboard is
 
    ports : constant Port_List :=
-     (Internal,
+     (eDP,
       DP1,
       DP2,
       HDMI1,
diff --git a/src/mainboard/google/slippy/gma-mainboard.ads b/src/mainboard/google/slippy/gma-mainboard.ads
index cd5e2f51be..e362f891ab 100644
--- a/src/mainboard/google/slippy/gma-mainboard.ads
+++ b/src/mainboard/google/slippy/gma-mainboard.ads
@@ -22,7 +22,7 @@ private package GMA.Mainboard is
 
    ports : constant Port_List :=
      (HDMI1,
-      Internal,
+      eDP,
       others => Disabled);
 
 end GMA.Mainboard;
diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig
index f945cc0316..b0ab7f948b 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -16,7 +16,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_TPM1
 	select INTEL_INT15
 	select MAINBOARD_HAS_LIBGFXINIT
-	select GFX_GMA_INTERNAL_IS_LVDS
+	select GFX_GMA_PANEL_1_ON_LVDS
 	select HAVE_IFD_BIN
 	select HAVE_ME_BIN
 	select SANDYBRIDGE_VBOOT_IN_ROMSTAGE
diff --git a/src/mainboard/google/stout/gma-mainboard.ads b/src/mainboard/google/stout/gma-mainboard.ads
index e45320f36e..105b231e4f 100644
--- a/src/mainboard/google/stout/gma-mainboard.ads
+++ b/src/mainboard/google/stout/gma-mainboard.ads
@@ -28,6 +28,7 @@ private package GMA.Mainboard is
       HDMI2,
       HDMI3,
       Analog,
-      Internal);
+      LVDS,
+      others => Disabled);
 
 end GMA.Mainboard;