summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/intel/apollolake/chip.c7
-rw-r--r--src/soc/intel/cannonlake/chip.c7
2 files changed, 2 insertions, 12 deletions
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index f122876ab6..405a45c8e2 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 @@ static void soc_init(void *data)
{
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 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *silupd)
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 57a32244ca..39e8e8ba33 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 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
/* 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++) {