From eb2e688a8ef8849c35d9cff68daaacb42cfca021 Mon Sep 17 00:00:00 2001
From: Brandon Breitenstein <brandon.breitenstein@intel.com>
Date: Wed, 31 Aug 2016 13:46:58 -0700
Subject: [PATCH] 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>
---
 src/drivers/intel/fsp2_0/include/fsp/soc_binding.h            | 4 ++--
 src/soc/intel/apollolake/Makefile.inc                         | 1 +
 .../fsp => vendorcode/intel/fsp/fsp2_0/apollolake}/FspUpd.h   | 0
 .../fsp => vendorcode/intel/fsp/fsp2_0/apollolake}/FspmUpd.h  | 0
 .../fsp => vendorcode/intel/fsp/fsp2_0/apollolake}/FspsUpd.h  | 0
 5 files changed, 3 insertions(+), 2 deletions(-)
 rename src/{soc/intel/apollolake/include/soc/fsp => vendorcode/intel/fsp/fsp2_0/apollolake}/FspUpd.h (100%)
 rename src/{soc/intel/apollolake/include/soc/fsp => vendorcode/intel/fsp/fsp2_0/apollolake}/FspmUpd.h (100%)
 rename src/{soc/intel/apollolake/include/soc/fsp => vendorcode/intel/fsp/fsp2_0/apollolake}/FspsUpd.h (100%)

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
similarity index 100%
rename from src/soc/intel/apollolake/include/soc/fsp/FspUpd.h
rename to 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
similarity index 100%
rename from src/soc/intel/apollolake/include/soc/fsp/FspmUpd.h
rename to 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
similarity index 100%
rename from src/soc/intel/apollolake/include/soc/fsp/FspsUpd.h
rename to src/vendorcode/intel/fsp/fsp2_0/apollolake/FspsUpd.h