From 8269096bd9c6d1aae85de1eb3481f8b94b4e8278 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Wed, 27 Sep 2017 15:24:58 +0200 Subject: [PATCH] drivers/intel/fsp2_0: use common code to fetch vbt.bin No need for having two of everything in the coreboot codebase. Change-Id: Ie1cdd1783dd5dababd1e97436a4ce1a4f068d5b3 Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/21723 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Aaron Durbin --- src/drivers/intel/fsp2_0/graphics.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/drivers/intel/fsp2_0/graphics.c b/src/drivers/intel/fsp2_0/graphics.c index 3207e1d5b5..84f2d6dc21 100644 --- a/src/drivers/intel/fsp2_0/graphics.c +++ b/src/drivers/intel/fsp2_0/graphics.c @@ -14,6 +14,7 @@ #include #include #include +#include enum pixel_format { pixel_rgbx_8bpc = 0, @@ -95,13 +96,16 @@ enum cb_err fsp_fill_lb_framebuffer(struct lb_framebuffer *framebuffer) uintptr_t fsp_load_vbt(void) { - void *vbt; + struct region_device rdev; + void *vbt_data = NULL; - vbt = cbfs_boot_map_with_leak("vbt.bin", CBFS_TYPE_RAW, NULL); - if (!vbt) + if (locate_vbt(&rdev) != CB_ERR) + vbt_data = rdev_mmap_full(&rdev); + + if (vbt_data == NULL) printk(BIOS_NOTICE, "Could not locate a VBT file in CBFS\n"); - return (uintptr_t)vbt; + return (uintptr_t)vbt_data; } int fill_lb_framebuffer(struct lb_framebuffer *framebuffer) -- 2.11.4.GIT