diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2017-10-05 18:19:29 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2017-10-06 17:07:23 +0000 |
| commit | c6a005019874fed9a9f663953a850b76a5fbf96c (patch) | |
| tree | ed34805925a4f3237d4283f7646377766b562822 | |
| parent | 9d3de2649f46cc85269b4877f0d6e715a4fec5aa (diff) | |
soc/intel/skylake: use locate_vbt directly instead of calling a wrapper
Change-Id: I65c423660ab1778f5dd9243e428a4d005bd1699a
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/21898
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
| -rw-r--r-- | src/drivers/intel/fsp2_0/graphics.c | 10 | ||||
| -rw-r--r-- | src/drivers/intel/fsp2_0/include/fsp/util.h | 7 | ||||
| -rw-r--r-- | src/soc/intel/skylake/chip_fsp20.c | 5 |
3 files changed, 3 insertions, 19 deletions
diff --git a/src/drivers/intel/fsp2_0/graphics.c b/src/drivers/intel/fsp2_0/graphics.c index f2888e8575..f1219ea15c 100644 --- a/src/drivers/intel/fsp2_0/graphics.c +++ b/src/drivers/intel/fsp2_0/graphics.c @@ -94,16 +94,6 @@ enum cb_err fsp_fill_lb_framebuffer(struct lb_framebuffer *framebuffer) return CB_SUCCESS; } -uintptr_t fsp_load_vbt(void) -{ - void *vbt_data = locate_vbt(); - - if (vbt_data == NULL) - printk(BIOS_NOTICE, "Could not locate a VBT file in CBFS\n"); - - return (uintptr_t)vbt_data; -} - int fill_lb_framebuffer(struct lb_framebuffer *framebuffer) { enum cb_err ret; diff --git a/src/drivers/intel/fsp2_0/include/fsp/util.h b/src/drivers/intel/fsp2_0/include/fsp/util.h index 402d48b273..6d53fda41f 100644 --- a/src/drivers/intel/fsp2_0/include/fsp/util.h +++ b/src/drivers/intel/fsp2_0/include/fsp/util.h @@ -85,13 +85,6 @@ bool fsp_guid_compare(const uint8_t guid1[16], const uint8_t guid2[16]); enum cb_err fsp_validate_component(struct fsp_header *hdr, const struct region_device *rdev); -/* Load a vbt.bin file for graphics. Returns 0 if a valid VBT is not found. */ -#if IS_ENABLED(CONFIG_RUN_FSP_GOP) -uintptr_t fsp_load_vbt(void); -#else -static inline uintptr_t fsp_load_vbt(void) { return 0; } -#endif - /* Get igd framebuffer bar from SoC */ uintptr_t fsp_soc_get_igd_bar(void); diff --git a/src/soc/intel/skylake/chip_fsp20.c b/src/soc/intel/skylake/chip_fsp20.c index ac60125f70..f9bdf8a1ef 100644 --- a/src/soc/intel/skylake/chip_fsp20.c +++ b/src/soc/intel/skylake/chip_fsp20.c @@ -28,6 +28,7 @@ #include <fsp/util.h> #include <romstage_handoff.h> #include <soc/acpi.h> +#include <soc/intel/common/vbt.h> #include <soc/interrupt.h> #include <soc/irq.h> #include <soc/pci_devs.h> @@ -116,9 +117,9 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) /* Load VBT */ if (is_s3_wakeup) { printk(BIOS_DEBUG, "S3 resume do not pass VBT to GOP\n"); - } else if (display_init_required()) { + } else if (display_init_required() && IS_ENABLED(CONFIG_RUN_FSP_GOP)) { /* Get VBT data */ - vbt_data = fsp_load_vbt(); + vbt_data = (uintptr_t)locate_vbt(); if (vbt_data) printk(BIOS_DEBUG, "Passing VBT to GOP\n"); else |