summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2017-06-17 23:33:19 -0500
committerStefan Reinauer <stefan.reinauer@coreboot.org>2017-07-14 00:00:11 +0000
commit6543d9a4f0d28f49478ab183b3a75f98e7e5875b (patch)
tree6cfd8419020f5b1c47002e1e474400a1344e97b7
parentd3bb09d9f498bd35cb7869dc45282b54f5a0ca78 (diff)
downloadcoreboot-6543d9a4f0d28f49478ab183b3a75f98e7e5875b.tar.xz
drivers/fsp1_1: remove VBT function defs from util.h
Including <fsp/gop.h> in util.h causes issues with redeclarations when using SOC_INTEL_COMMON_GFX_OPREGION along with FSP 1.1. Separating it out and including directly in vbt.c has no negative side effects. Change-Id: I2d82c2da40b067272d876929fc73b97f490146a7 Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/20448 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/drivers/intel/fsp1_1/include/fsp/util.h1
-rw-r--r--src/drivers/intel/fsp1_1/vbt.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/drivers/intel/fsp1_1/include/fsp/util.h b/src/drivers/intel/fsp1_1/include/fsp/util.h
index 8f552560d5..ffc43bc01c 100644
--- a/src/drivers/intel/fsp1_1/include/fsp/util.h
+++ b/src/drivers/intel/fsp1_1/include/fsp/util.h
@@ -21,7 +21,6 @@
#include <fsp/api.h>
/* Current users expect to get the SoC's FSP definitions by including util.h. */
#include <fsp/soc_binding.h>
-#include <fsp/gop.h>
#include <program_loading.h>
#include <commonlib/region.h>
diff --git a/src/drivers/intel/fsp1_1/vbt.c b/src/drivers/intel/fsp1_1/vbt.c
index 5cac150d01..92a4c91cbf 100644
--- a/src/drivers/intel/fsp1_1/vbt.c
+++ b/src/drivers/intel/fsp1_1/vbt.c
@@ -17,6 +17,7 @@
#include <bootmode.h>
#include <cbfs.h>
#include <console/console.h>
+#include <fsp/gop.h>
#include <fsp/ramstage.h>
#include <fsp/util.h>