[coreboot-gerrit] Change in coreboot[master]: soc/intel/skylake: use locate_vbt directly instead of calling a wrapper

[Patrick Georgi (Code Review)]

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/21898


Change subject: soc/intel/skylake: use locate_vbt directly instead of calling a wrapper
......................................................................

soc/intel/skylake: use locate_vbt directly instead of calling a wrapper

Change-Id: I65c423660ab1778f5dd9243e428a4d005bd1699a
Signed-off-by: Patrick Georgi <pgeorgi at google.com>
---
M src/drivers/intel/fsp2_0/graphics.c
M src/drivers/intel/fsp2_0/include/fsp/util.h
M src/soc/intel/skylake/chip_fsp20.c
3 files changed, 2 insertions(+), 19 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/21898/1

diff --git a/src/drivers/intel/fsp2_0/graphics.c b/src/drivers/intel/fsp2_0/graphics.c
index f2888e8..f1219ea 100644
--- a/src/drivers/intel/fsp2_0/graphics.c
+++ b/src/drivers/intel/fsp2_0/graphics.c
@@ -94,16 +94,6 @@
 	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 402d48b..6d53fda 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 @@
 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 b1697ae..6e8ed48 100644
--- a/src/soc/intel/skylake/chip_fsp20.c
+++ b/src/soc/intel/skylake/chip_fsp20.c
@@ -116,9 +116,9 @@
 	/* 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

-- 
To view, visit https://review.coreboot.org/21898
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65c423660ab1778f5dd9243e428a4d005bd1699a
Gerrit-Change-Number: 21898
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Georgi <pgeorgi at google.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20171005/f5c4e0cf/attachment.html>