commit 63ec8364dc2af8806ac1f52d806a2360128eb07e
author Nico Huber <nico.h@gmx.de> Sat Jun 09 17:42:19 2018 +0200
committer Nico Huber <nico.h@gmx.de> Wed May 08 12:31:31 2019 +0000
tree 552512a539d8b24f9eef17a52c44b156c1d24f87
parent 63dc9190f178cae95705e980f002565c40fa981c

gma: Give constants depending on Config.CPU* a type

To reduce elaboration time dependencies, turn number constants into
variable constants by giving them a type. This will allow us to use
the same code for configurations with constant and non-constant
`GMA.Config.CPU*`.

Change-Id: I0b671cb18701d0ecae118e023e0fd21be5095da0
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/libgfxinit/+/27063
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>

common/hw-gfx-gma.adb

diff --git a/common/hw-gfx-gma.adb b/common/hw-gfx-gma.adb
index 0a80d6b..dfe986f 100644
--- a/common/hw-gfx-gma.adb
+++ b/common/hw-gfx-gma.adb
@@ -695,7 +695,7 @@
    with
       Pre => Is_Initialized
    is
-      GGC_Reg : constant :=
+      GGC_Reg : constant PCI.Index :=
         (if Config.Gen_G45 or Config.CPU_Ironlake then 16#52# else 16#50#);
       GGC : Word16;
    begin

common/ironlake/hw-gfx-gma-connectors-fdi.adb

diff --git a/common/ironlake/hw-gfx-gma-connectors-fdi.adb b/common/ironlake/hw-gfx-gma-connectors-fdi.adb
index 5b7f105..9821f8e 100644
--- a/common/ironlake/hw-gfx-gma-connectors-fdi.adb
+++ b/common/ironlake/hw-gfx-gma-connectors-fdi.adb
@@ -270,7 +270,7 @@
 
    procedure Pre_On (Port_Cfg : Port_Config)
    is
-      Composite_Sel : constant :=
+      Composite_Sel : constant Word32 :=
         (if Config.Has_FDI_Composite_Sel then
             FDI_TX_CTL_COMPOSITE_SYNC_SELECT else 0);
    begin