[coreboot-gerrit] Change in coreboot[master]: soc/intel/*lake: Load vbt when it's needed

[Patrick Georgi (Code Review)]

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


Change subject: soc/intel/*lake: Load vbt when it's needed
......................................................................

soc/intel/*lake: Load vbt when it's needed

That removes the need for another global variable.

Change-Id: I25e12ba724836de4c8afb25cd347cafe6df8cea9
Signed-off-by: Patrick Georgi <pgeorgi at google.com>
---
M src/soc/intel/apollolake/chip.c
M src/soc/intel/cannonlake/chip.c
2 files changed, 2 insertions(+), 12 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/21907/1

diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index f122876..405a45c 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -48,8 +48,6 @@
 
 #include "chip.h"
 
-static void *vbt;
-
 static const char *soc_acpi_name(const struct device *dev)
 {
 	if (dev->path.type == DEVICE_PATH_DOMAIN)
@@ -315,9 +313,6 @@
 {
 	struct global_nvs_t *gnvs;
 
-	/* Save VBT info and mapping */
-	vbt = vbt_get();
-
 	/* Snapshot the current GPIO IRQ polarities. FSP is setting a
 	 * default policy that doesn't honor boards' requirements. */
 	itss_snapshot_irq_polarities(GPIO_IRQ_START, GPIO_IRQ_END);
@@ -534,7 +529,7 @@
 	static struct soc_intel_apollolake_config *cfg;
 
 	/* Load VBT before devicetree-specific config. */
-	silconfig->GraphicsConfigPtr = (uintptr_t)vbt;
+	silconfig->GraphicsConfigPtr = (uintptr_t)vbt_get();
 
 	struct device *dev = SA_DEV_ROOT;
 
diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c
index 57a3224..39e8e8b 100644
--- a/src/soc/intel/cannonlake/chip.c
+++ b/src/soc/intel/cannonlake/chip.c
@@ -25,8 +25,6 @@
 #include <soc/ramstage.h>
 #include <string.h>
 
-static void *vbt;
-
 #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
 static const char *soc_acpi_name(const struct device *dev)
 {
@@ -180,11 +178,8 @@
 	/* Parse device tree and enable/disable devices */
 	parse_devicetree(params);
 
-	/* Save VBT info and mapping */
-	vbt = vbt_get();
-
 	/* Load VBT before devicetree-specific config. */
-	params->GraphicsConfigPtr = (uintptr_t)vbt;
+	params->GraphicsConfigPtr = (uintptr_t)vbt_get();
 
 	/* Set USB OC pin to 0 first */
 	for (i = 0; i < ARRAY_SIZE(params->Usb2OverCurrentPin); i++) {

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

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I25e12ba724836de4c8afb25cd347cafe6df8cea9
Gerrit-Change-Number: 21907
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/20171006/a2ffb1eb/attachment.html>