Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/20448
Change subject: drivers/fsp1_1: remove VBT function defs from util.h ......................................................................
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 --- M src/drivers/intel/fsp1_1/include/fsp/util.h M src/drivers/intel/fsp1_1/vbt.c 2 files changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/20448/1
diff --git a/src/drivers/intel/fsp1_1/include/fsp/util.h b/src/drivers/intel/fsp1_1/include/fsp/util.h index 8f55256..ffc43bc 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 5cac150..92a4c91 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>