summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Breitenstein <brandon.breitenstein@intel.com>2016-08-31 13:46:58 -0700
committerMartin Roth <martinroth@google.com>2016-09-02 18:12:57 +0200
commiteb2e688a8ef8849c35d9cff68daaacb42cfca021 (patch)
treef46a30d1264f0ec71ea6e0fd7624400653a3ccdc
parentc31ba0ef529ef571ea839572f2c701a871cb33d7 (diff)
apollolake: relocate fsp header files to vendorcode
FSP header files should be located in vendorcode, not soc directory. This patch includes changes any references to the old location to the new location. Change-Id: I44270392617418ec1b9dec15ee187863f2503341 Signed-off-by: Brandon Breitenstein <brandon.breitenstein@intel.com> Reviewed-on: https://review.coreboot.org/16310 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/drivers/intel/fsp2_0/include/fsp/soc_binding.h4
-rw-r--r--src/soc/intel/apollolake/Makefile.inc1
-rw-r--r--src/vendorcode/intel/fsp/fsp2_0/apollolake/FspUpd.h (renamed from src/soc/intel/apollolake/include/soc/fsp/FspUpd.h)0
-rw-r--r--src/vendorcode/intel/fsp/fsp2_0/apollolake/FspmUpd.h (renamed from src/soc/intel/apollolake/include/soc/fsp/FspmUpd.h)0
-rw-r--r--src/vendorcode/intel/fsp/fsp2_0/apollolake/FspsUpd.h (renamed from src/soc/intel/apollolake/include/soc/fsp/FspsUpd.h)0
5 files changed, 3 insertions, 2 deletions
diff --git a/src/drivers/intel/fsp2_0/include/fsp/soc_binding.h b/src/drivers/intel/fsp2_0/include/fsp/soc_binding.h
index 6369986d2a..1ff843529c 100644
--- a/src/drivers/intel/fsp2_0/include/fsp/soc_binding.h
+++ b/src/drivers/intel/fsp2_0/include/fsp/soc_binding.h
@@ -22,8 +22,8 @@
* FSP implementations for different chipsets.
*/
#include <Base.h>
-#include <soc/fsp/FspmUpd.h>
-#include <soc/fsp/FspsUpd.h>
+#include <FspmUpd.h>
+#include <FspsUpd.h>
#pragma pack(pop)
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index 1f3c276c3a..3c45cbe026 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -93,6 +93,7 @@ verstage-y += reset.c
verstage-y += spi.c
CPPFLAGS_common += -I$(src)/soc/intel/apollolake/include
+CPPFLAGS_common += -I$(src)/vendorcode/intel/fsp/fsp2_0/apollolake
# Since FSP-M runs in CAR we need to relocate it to a specific address
$(CONFIG_FSP_M_CBFS)-options := -b $(CONFIG_FSP_M_ADDR)
diff --git a/src/soc/intel/apollolake/include/soc/fsp/FspUpd.h b/src/vendorcode/intel/fsp/fsp2_0/apollolake/FspUpd.h
index a7114ce39e..a7114ce39e 100644
--- a/src/soc/intel/apollolake/include/soc/fsp/FspUpd.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/apollolake/FspUpd.h
diff --git a/src/soc/intel/apollolake/include/soc/fsp/FspmUpd.h b/src/vendorcode/intel/fsp/fsp2_0/apollolake/FspmUpd.h
index 48225e0779..48225e0779 100644
--- a/src/soc/intel/apollolake/include/soc/fsp/FspmUpd.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/apollolake/FspmUpd.h
diff --git a/src/soc/intel/apollolake/include/soc/fsp/FspsUpd.h b/src/vendorcode/intel/fsp/fsp2_0/apollolake/FspsUpd.h
index 553eba3f18..553eba3f18 100644
--- a/src/soc/intel/apollolake/include/soc/fsp/FspsUpd.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/apollolake/FspsUpd.h