Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/libgfxinit/+/55166 )
Change subject: Adapt to gcc11 compatible libhwbase API ......................................................................
Adapt to gcc11 compatible libhwbase API
Change-Id: I0054920b27d4c6ee75f2caa9a6c9b5005a694045 Signed-off-by: Patrick Georgi pgeorgi@google.com --- M common/hw-gfx-framebuffer_filler.adb M common/hw-gfx-framebuffer_filler.ads M common/hw-gfx-gma-registers.adb M common/hw-gfx-gma-registers.ads M common/hw-gfx-gma.ads 5 files changed, 7 insertions(+), 23 deletions(-)
git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/66/55166/1
diff --git a/common/hw-gfx-framebuffer_filler.adb b/common/hw-gfx-framebuffer_filler.adb index 29c7da6..8df556d 100644 --- a/common/hw-gfx-framebuffer_filler.adb +++ b/common/hw-gfx-framebuffer_filler.adb @@ -23,8 +23,7 @@
type FB_Index is new Natural range 0 .. Natural (Width_Type'Last * Height_Type'Last) - 1; - type FB_Range is array (FB_Index) of Word32 with Pack; - package FB is new MMIO_Range (0, Word32, FB_Index, FB_Range); + package FB is new MMIO_Range (0, Word32, FB_Index);
procedure Fill (Linear_FB : Word64; Framebuffer : Framebuffer_Type) is diff --git a/common/hw-gfx-framebuffer_filler.ads b/common/hw-gfx-framebuffer_filler.ads index 7ad3b79..4ad685e 100644 --- a/common/hw-gfx-framebuffer_filler.ads +++ b/common/hw-gfx-framebuffer_filler.ads @@ -20,7 +20,7 @@
package HW.GFX.Framebuffer_Filler with - Abstract_State => ((State with External), Base_Address), + Abstract_State => ((State with External), (Base_Address with External)), Initializes => Base_Address is
diff --git a/common/hw-gfx-gma-registers.adb b/common/hw-gfx-gma-registers.adb index 3f0d7ae..b92102c 100644 --- a/common/hw-gfx-gma-registers.adb +++ b/common/hw-gfx-gma-registers.adb @@ -33,39 +33,24 @@
type Registers_Range is new Natural range 0 .. 16#0020_0000# / Register_Width - 1; - type Registers_Type is array (Registers_Range) of Word32 - with - Atomic_Components, - Size => 16#20_0000# * 8; package Regs is new MMIO_Range (Base_Addr => Config.Default_MMIO_Base, Element_T => Word32, - Index_T => Registers_Range, - Array_T => Registers_Type); + Index_T => Registers_Range);
----------------------------------------------------------------------------
type GTT_PTE_32 is mod 2 ** 32; - type GTT_Registers_32 is array (GTT_Range) of GTT_PTE_32 - with - Volatile_Components, - Size => MMIO_GTT_32_Size * 8; package GTT_32 is new MMIO_Range (Base_Addr => Config.Default_MMIO_Base + MMIO_GTT_32_Offset, Element_T => GTT_PTE_32, - Index_T => GTT_Range, - Array_T => GTT_Registers_32); + Index_T => GTT_Range);
type GTT_PTE_64 is mod 2 ** 64; - type GTT_Registers_64 is array (GTT_Range) of GTT_PTE_64 - with - Volatile_Components, - Size => MMIO_GTT_64_Size * 8; package GTT_64 is new MMIO_Range (Base_Addr => Config.Default_MMIO_Base + MMIO_GTT_64_Offset, Element_T => GTT_PTE_64, - Index_T => GTT_Range, - Array_T => GTT_Registers_64); + Index_T => GTT_Range);
GTT_PTE_Valid : constant := 1;
diff --git a/common/hw-gfx-gma-registers.ads b/common/hw-gfx-gma-registers.ads index 3318ab1..1a0c644 100644 --- a/common/hw-gfx-gma-registers.ads +++ b/common/hw-gfx-gma-registers.ads @@ -19,7 +19,7 @@ private package HW.GFX.GMA.Registers with Abstract_State => - ((Address_State with Part_Of => GMA.State), + ((Address_State with External, Part_Of => GMA.State), (Register_State with External, Part_Of => GMA.Device_State), (GTT_State with External, Part_Of => GMA.Device_State)), Initializes => Address_State diff --git a/common/hw-gfx-gma.ads b/common/hw-gfx-gma.ads index afd1512..d946b99 100644 --- a/common/hw-gfx-gma.ads +++ b/common/hw-gfx-gma.ads @@ -22,7 +22,7 @@ package HW.GFX.GMA with Abstract_State => - (State, + ((State with External), Init_State, (Device_State with External)), Initializes => Init_State