vendorcode/intel: Remove Ice Lake FSP Bindings

By updating the FSP submodule we now got all FSP headers from within
that repo. This commit changes the default paths to use these and
fixes some include paths to allow the usage of
vendorcode/intel/edk2/UDK2017 together with the official Intel
distribution.

We are also adding back the CHANNEL_PRESENT enum, that is
missing in the official headers.

This was tested on the Razer Blade Stealth (late 2019).

Change-Id: I7d5520dcd30f4a68af325125052e16e867e91ec9
Signed-off-by: Johanna Schander <coreboot@mimoja.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37579
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Christoph Pomaska <github@slrie.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

1 files changed, 14 insertions, 4 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 931e427188..607738d7a4 100644
--- a/src/drivers/intel/fsp2_0/include/fsp/soc_binding.h
+++ b/src/drivers/intel/fsp2_0/include/fsp/soc_binding.h
@@ -17,6 +17,20 @@
 #include <stddef.h>
 
 #pragma pack(push)
+
+/**
+ * These includes are required to include headers that are missing in
+ * the FSP headers. Import order matter for the correct PiHob definition
+ * to be found.
+ */
+#if CONFIG_UDK_VERSION >= CONFIG_UDK_2017_VERSION
+#include <PiPei.h>
+#include <Ppi/MpServices.h>
+#include <Uefi/UefiMultiPhase.h>
+#include <Pi/PiBootMode.h>
+#include <Pi/PiHob.h>
+#endif
+
 /*
  * This file is a implementation specific header. i.e. different
  * FSP implementations for different chipsets.
@@ -28,10 +42,6 @@
 #include <FirmwareVersionInfoHob.h>
 #endif
 
-#if CONFIG_UDK_VERSION >= CONFIG_UDK_2017_VERSION
-#include <PiPei.h>
-#include <Ppi/MpServices.h>
-#endif
 
 #pragma pack(pop)