From bdb5c8feaed4cf914b474deeb30686e327ee9228 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 16 May 2017 21:39:50 -0500 Subject: coreboot_tables: specify clear interface for lb_framebuffer() For some reason the "interface" for adding framebuffer information is sitting in src/include/vbe.h while also guarding the call to fill_lb_framebuffer() with vbe_mode_info_valid() along with some macro if CONFIG_* for good measure. Move the fill_lb_framebuffer() declaration to coreboot_tables.h and provide a comment about how it should be used. Also, now that there's no need for the notion of a global vbe_mode_info_valid() remove it from the conditional call path of fill_lb_framebuffer(). Change-Id: Ib3ade6314624091ae70424664527a02b279d0c9b Signed-off-by: Aaron Durbin Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/19729 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/drivers/intel/fsp1_1/fsp_gop.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/drivers/intel/fsp1_1') diff --git a/src/drivers/intel/fsp1_1/fsp_gop.c b/src/drivers/intel/fsp1_1/fsp_gop.c index 28ed06d763..dd190145e1 100644 --- a/src/drivers/intel/fsp1_1/fsp_gop.c +++ b/src/drivers/intel/fsp1_1/fsp_gop.c @@ -57,11 +57,8 @@ const optionrom_vbt_t *fsp_get_vbt(uint32_t *vbt_len) return vbt.data; } -void lb_framebuffer(struct lb_header *header) +int fill_lb_framebuffer(struct lb_framebuffer *framebuffer) { - struct lb_framebuffer *framebuffer; - framebuffer = (struct lb_framebuffer *)lb_new_record(header); - VOID *hob_list_ptr; hob_list_ptr = get_hob_list(); const EFI_GUID vbt_guid = EFI_PEI_GRAPHICS_INFO_HOB_GUID; @@ -70,7 +67,7 @@ void lb_framebuffer(struct lb_header *header) vbt_hob = get_next_guid_hob(&vbt_guid, hob_list_ptr); if (vbt_hob == NULL) { printk(BIOS_ERR, "FSP_ERR: Graphics Data HOB is not present\n"); - return; + return -1; } printk(BIOS_DEBUG, "FSP_DEBUG: Graphics Data HOB present\n"); vbt_gop = GET_GUID_HOB_DATA(vbt_hob); @@ -89,6 +86,6 @@ void lb_framebuffer(struct lb_header *header) framebuffer->blue_mask_size = 8; framebuffer->reserved_mask_pos = 24; framebuffer->reserved_mask_size = 8; - framebuffer->tag = LB_TAG_FRAMEBUFFER; - framebuffer->size = sizeof(*framebuffer); + + return 0; } -- cgit v1.2.3