summaryrefslogtreecommitdiff
path: root/src/soc/intel/apollolake
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2017-10-05 18:10:09 +0200
committerPatrick Georgi <pgeorgi@google.com>2017-10-06 16:59:31 +0000
commit9d3de2649f46cc85269b4877f0d6e715a4fec5aa (patch)
tree3c5dc7955bc90ff0a2c6c097f1c6453f3ec35bd7 /src/soc/intel/apollolake
parentcba7316c2662ee1c916345b034ca08dad43984f7 (diff)
downloadcoreboot-9d3de2649f46cc85269b4877f0d6e715a4fec5aa.tar.xz
soc/intel/common: refactor locate_vbt and vbt_get
Instead of having all callers provide a region_device just for the purpose of reading vbt.bin, let locate_vbt handle its entire life cycle, simplifying the VBT access API. Change-Id: Ib85e55164e217050b67674d020d17b2edf5ad14d Signed-off-by: Patrick Georgi <pgeorgi@google.com> Reviewed-on: https://review.coreboot.org/21897 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel/apollolake')
-rw-r--r--src/soc/intel/apollolake/chip.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index 5759fb6f4c..f122876ab6 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -49,7 +49,6 @@
#include "chip.h"
static void *vbt;
-static struct region_device vbt_rdev;
static const char *soc_acpi_name(const struct device *dev)
{
@@ -317,7 +316,7 @@ static void soc_init(void *data)
struct global_nvs_t *gnvs;
/* Save VBT info and mapping */
- vbt = vbt_get(&vbt_rdev);
+ vbt = vbt_get();
/* Snapshot the current GPIO IRQ polarities. FSP is setting a
* default policy that doesn't honor boards' requirements. */
@@ -354,9 +353,6 @@ static void soc_init(void *data)
static void soc_final(void *data)
{
- if (vbt)
- rdev_munmap(&vbt_rdev, vbt);
-
/* Disable global reset, just in case */
pmc_global_reset_enable(0);
/* Make sure payload/OS can't trigger global reset */