gma: Merge `Config_State` into `State`
Treating `Config_State` separately was merely cosmetic and caused
lots of trouble. Its usage depends heavily on the selected plat-
form. Hence, `Global` contracts were not stable across different
configurations.
Let's avoid the annotation mess that it brought us and merge it
into `State`.
Change-Id: Ie28ccfc7ffbe08e0b3fe343d9e6df2420611834e
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/libgfxinit/+/35713
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
diff --git a/common/hw-gfx-gma.adb b/common/hw-gfx-gma.adb
index 8352e1c..3221e3e 100644
--- a/common/hw-gfx-gma.adb
+++ b/common/hw-gfx-gma.adb
@@ -38,7 +38,8 @@
package body HW.GFX.GMA
with Refined_State =>
(State =>
- (PCI_Usable,
+ (Config.Variable,
+ PCI_Usable,
Dev.Address_State,
Registers.Address_State,
PCode.Mailbox_Ready,
@@ -47,7 +48,6 @@
HPD_Delay, Wait_For_HPD,
Linear_FB_Base),
Init_State => Initialized,
- Config_State => (Config.Variable),
Device_State =>
(Dev.PCI_State, Registers.Register_State, Registers.GTT_State))
is