From 22579596ffa77889062d7655a366682cfeae84f7 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Fri, 6 Oct 2017 17:36:09 +0200 Subject: 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 Reviewed-on: https://review.coreboot.org/21907 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/soc/intel/cannonlake/chip.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/soc/intel/cannonlake/chip.c') 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 #include -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++) { -- cgit v1.2.3