summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/drivers/intel/gma/Makefile.inc8
-rw-r--r--src/drivers/intel/gma/gma-gfx_init.ads38
-rw-r--r--src/drivers/intel/gma/gma.ads38
-rw-r--r--src/drivers/intel/gma/hires_fb/gma-gfx_init.adb (renamed from src/drivers/intel/gma/hires_fb/gma.adb)4
-rw-r--r--src/drivers/intel/gma/text_fb/gma-gfx_init.adb (renamed from src/drivers/intel/gma/text_fb/gma.adb)4
5 files changed, 48 insertions, 44 deletions
diff --git a/src/drivers/intel/gma/Makefile.inc b/src/drivers/intel/gma/Makefile.inc
index ebc688f990..e128ad6474 100644
--- a/src/drivers/intel/gma/Makefile.inc
+++ b/src/drivers/intel/gma/Makefile.inc
@@ -50,11 +50,13 @@ CONFIG_GFX_GMA_DEFAULT_MMIO := 0 # dummy, will be overwritten at runtime
subdirs-y += ../../../../3rdparty/libgfxinit
-ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma.ads
+ramstage-y += gma.ads
+
+ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-gfx_init.ads
ifeq ($(CONFIG_LINEAR_FRAMEBUFFER),y)
-ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += hires_fb/gma.adb
+ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += hires_fb/gma-gfx_init.adb
else
-ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += text_fb/gma.adb
+ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += text_fb/gma-gfx_init.adb
endif
endif # CONFIG_GFX_GMA
diff --git a/src/drivers/intel/gma/gma-gfx_init.ads b/src/drivers/intel/gma/gma-gfx_init.ads
new file mode 100644
index 0000000000..7c96f9adf7
--- /dev/null
+++ b/src/drivers/intel/gma/gma-gfx_init.ads
@@ -0,0 +1,38 @@
+with Interfaces.C;
+
+with HW;
+use HW;
+
+package GMA.GFX_Init
+is
+
+ procedure gfxinit (lightup_ok : out Interfaces.C.int);
+ pragma Export (C, gfxinit, "gma_gfxinit");
+
+ ----------------------------------------------------------------------------
+
+ type lb_framebuffer is record
+ tag : word32;
+ size : word32;
+
+ physical_address : word64;
+ x_resolution : word32;
+ y_resolution : word32;
+ bytes_per_line : word32;
+ bits_per_pixel : word8;
+ red_mask_pos : word8;
+ red_mask_size : word8;
+ green_mask_pos : word8;
+ green_mask_size : word8;
+ blue_mask_pos : word8;
+ blue_mask_size : word8;
+ reserved_mask_pos : word8;
+ reserved_mask_size : word8;
+ end record;
+
+ function fill_lb_framebuffer
+ (framebuffer : in out lb_framebuffer)
+ return Interfaces.C.int;
+ pragma Export (C, fill_lb_framebuffer, "fill_lb_framebuffer");
+
+end GMA.GFX_Init;
diff --git a/src/drivers/intel/gma/gma.ads b/src/drivers/intel/gma/gma.ads
index 7286e7e568..a6ce3a4f77 100644
--- a/src/drivers/intel/gma/gma.ads
+++ b/src/drivers/intel/gma/gma.ads
@@ -1,38 +1,2 @@
-with Interfaces.C;
-
-with HW;
-use HW;
-
-package GMA
-is
-
- procedure gfxinit (lightup_ok : out Interfaces.C.int);
- pragma Export (C, gfxinit, "gma_gfxinit");
-
- ----------------------------------------------------------------------------
-
- type lb_framebuffer is record
- tag : word32;
- size : word32;
-
- physical_address : word64;
- x_resolution : word32;
- y_resolution : word32;
- bytes_per_line : word32;
- bits_per_pixel : word8;
- red_mask_pos : word8;
- red_mask_size : word8;
- green_mask_pos : word8;
- green_mask_size : word8;
- blue_mask_pos : word8;
- blue_mask_size : word8;
- reserved_mask_pos : word8;
- reserved_mask_size : word8;
- end record;
-
- function fill_lb_framebuffer
- (framebuffer : in out lb_framebuffer)
- return Interfaces.C.int;
- pragma Export (C, fill_lb_framebuffer, "fill_lb_framebuffer");
-
+package GMA is
end GMA;
diff --git a/src/drivers/intel/gma/hires_fb/gma.adb b/src/drivers/intel/gma/hires_fb/gma-gfx_init.adb
index e3553ca3c0..1393784d7b 100644
--- a/src/drivers/intel/gma/hires_fb/gma.adb
+++ b/src/drivers/intel/gma/hires_fb/gma-gfx_init.adb
@@ -13,7 +13,7 @@ use HW.GFX.GMA.Display_Probing;
with GMA.Mainboard;
-package body GMA
+package body GMA.GFX_Init
is
fb_valid : boolean := false;
@@ -114,4 +114,4 @@ is
end if;
end gfxinit;
-end GMA;
+end GMA.GFX_Init;
diff --git a/src/drivers/intel/gma/text_fb/gma.adb b/src/drivers/intel/gma/text_fb/gma-gfx_init.adb
index 145b9a047e..038b76b26a 100644
--- a/src/drivers/intel/gma/text_fb/gma.adb
+++ b/src/drivers/intel/gma/text_fb/gma-gfx_init.adb
@@ -8,7 +8,7 @@ use HW.GFX.GMA.Display_Probing;
with GMA.Mainboard;
-package body GMA
+package body GMA.GFX_Init
is
function fill_lb_framebuffer
@@ -65,4 +65,4 @@ is
end if;
end gfxinit;
-end GMA;
+end GMA.GFX_Init;