Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31456
Change subject: drivers/intel/gma: Move gfxinit into sub package ......................................................................
drivers/intel/gma: Move gfxinit into sub package
Move the actual graphics init provided by libgfxinit into a sub package `GMA.GFX_Init`. This way it can be compiled in individually.
Change-Id: Ib413a0d70c8dc305f4476c1d5aee6b81ff880bec Signed-off-by: Nico Huber nico.h@gmx.de --- M src/drivers/intel/gma/Makefile.inc A src/drivers/intel/gma/gma-gfx_init.ads M src/drivers/intel/gma/gma.ads R src/drivers/intel/gma/hires_fb/gma-gfx_init.adb R src/drivers/intel/gma/text_fb/gma-gfx_init.adb 5 files changed, 48 insertions(+), 44 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/56/31456/1
diff --git a/src/drivers/intel/gma/Makefile.inc b/src/drivers/intel/gma/Makefile.inc index ebc688f..e128ad6 100644 --- a/src/drivers/intel/gma/Makefile.inc +++ b/src/drivers/intel/gma/Makefile.inc @@ -50,11 +50,13 @@
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 0000000..7c96f9a --- /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 7286e7e..a6ce3a4 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 similarity index 98% rename from src/drivers/intel/gma/hires_fb/gma.adb rename to src/drivers/intel/gma/hires_fb/gma-gfx_init.adb index e3553ca..1393784 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 @@
with GMA.Mainboard;
-package body GMA +package body GMA.GFX_Init is
fb_valid : boolean := false; @@ -114,4 +114,4 @@ 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 similarity index 97% rename from src/drivers/intel/gma/text_fb/gma.adb rename to src/drivers/intel/gma/text_fb/gma-gfx_init.adb index 145b9a0..038b76b 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 @@
with GMA.Mainboard;
-package body GMA +package body GMA.GFX_Init is
function fill_lb_framebuffer @@ -65,4 +65,4 @@ end if; end gfxinit;
-end GMA; +end GMA.GFX_Init;
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31456 )
Change subject: drivers/intel/gma: Move gfxinit into sub package ......................................................................
Patch Set 2: Code-Review+2
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31456 )
Change subject: drivers/intel/gma: Move gfxinit into sub package ......................................................................
drivers/intel/gma: Move gfxinit into sub package
Move the actual graphics init provided by libgfxinit into a sub package `GMA.GFX_Init`. This way it can be compiled in individually.
Change-Id: Ib413a0d70c8dc305f4476c1d5aee6b81ff880bec Signed-off-by: Nico Huber nico.h@gmx.de Reviewed-on: https://review.coreboot.org/c/coreboot/+/31456 Reviewed-by: Patrick Georgi pgeorgi@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/drivers/intel/gma/Makefile.inc A src/drivers/intel/gma/gma-gfx_init.ads M src/drivers/intel/gma/gma.ads R src/drivers/intel/gma/hires_fb/gma-gfx_init.adb R src/drivers/intel/gma/text_fb/gma-gfx_init.adb 5 files changed, 48 insertions(+), 44 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved
diff --git a/src/drivers/intel/gma/Makefile.inc b/src/drivers/intel/gma/Makefile.inc index ebc688f..e128ad6 100644 --- a/src/drivers/intel/gma/Makefile.inc +++ b/src/drivers/intel/gma/Makefile.inc @@ -50,11 +50,13 @@
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 0000000..7c96f9a --- /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 7286e7e..a6ce3a4 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 similarity index 98% rename from src/drivers/intel/gma/hires_fb/gma.adb rename to src/drivers/intel/gma/hires_fb/gma-gfx_init.adb index e3553ca..1393784 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 @@
with GMA.Mainboard;
-package body GMA +package body GMA.GFX_Init is
fb_valid : boolean := false; @@ -114,4 +114,4 @@ 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 similarity index 97% rename from src/drivers/intel/gma/text_fb/gma.adb rename to src/drivers/intel/gma/text_fb/gma-gfx_init.adb index 145b9a0..038b76b 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 @@
with GMA.Mainboard;
-package body GMA +package body GMA.GFX_Init is
function fill_lb_framebuffer @@ -65,4 +65,4 @@ end if; end gfxinit;
-end GMA; +end GMA.GFX_Init;
-
Nico Huber (Code Review) -
Patrick Georgi (Code Review)