[coreboot-gerrit] Change in coreboot[master]: soc/intel: unify VBT fetching API

[Patrick Georgi (Code Review)]

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


Change subject: soc/intel: unify VBT fetching API
......................................................................

soc/intel: unify VBT fetching API

Skylake used the inner function, wrapping it in the same set of tests as
the common code does, but expressed differently.

Change-Id: Ifa6912255e7874a6e80301d49128adda6f624209
Signed-off-by: Patrick Georgi <pgeorgi at google.com>
---
M src/soc/intel/skylake/chip_fsp20.c
1 file changed, 1 insertion(+), 14 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/26037/1

diff --git a/src/soc/intel/skylake/chip_fsp20.c b/src/soc/intel/skylake/chip_fsp20.c
index 6e91816..07c9ee6 100644
--- a/src/soc/intel/skylake/chip_fsp20.c
+++ b/src/soc/intel/skylake/chip_fsp20.c
@@ -100,7 +100,7 @@
 	uintptr_t vbt_data = 0;
 	int i;
 
-	int is_s3_wakeup = acpi_is_wakeup_s3();
+	vbt_data = (uintptr_t)vbt_get();
 
 	struct device *dev = SA_DEV_ROOT;
 	if (!dev || !dev->chip_info) {
@@ -117,19 +117,6 @@
 		printk(BIOS_DEBUG, "psys_pmax = %d\n", tconfig->PsysPmax);
 	}
 
-	/* Load VBT */
-	if (is_s3_wakeup) {
-		printk(BIOS_DEBUG, "S3 resume do not pass VBT to GOP\n");
-	} else if (display_init_required() && IS_ENABLED(CONFIG_RUN_FSP_GOP)) {
-		/* Get VBT data */
-		vbt_data = (uintptr_t)locate_vbt();
-		if (vbt_data)
-			printk(BIOS_DEBUG, "Passing VBT to GOP\n");
-		else
-			printk(BIOS_DEBUG, "VBT not found!\n");
-	} else {
-		printk(BIOS_DEBUG, "Not passing VBT to GOP\n");
-	}
 	params->GraphicsConfigPtr = (u32) vbt_data;
 
 	for (i = 0; i < ARRAY_SIZE(config->usb2_ports); i++) {

-- 
To view, visit https://review.coreboot.org/26037
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa6912255e7874a6e80301d49128adda6f624209
Gerrit-Change-Number: 26037
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/20180503/dcd8c1eb/attachment.html>