UPSTREAM: 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.

BUG=None
BRANCH=None
TEST=None

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>

Change-Id: I44270392617418ec1b9dec15ee187863f2503341
Reviewed-on: https://chromium-review.googlesource.com/381008
Commit-Ready: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

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)
 

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)