[coreboot-gerrit] New patch to review for coreboot: commonlib: move uefi includes out of commonlib includes

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13526

-gerrit

commit 47c579373b82174a14d279d6ed2cd7b4c35251d1
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date:   Sat Jan 30 02:05:56 2016 -0800

    commonlib: move uefi includes out of commonlib includes
    
    ... and move them into the code using them, instead.
    
    Change-Id: I2391234797ad00da8038dda198eadf0b0fcaedb2
    Signed-off-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
---
 src/commonlib/fsp1_1_relocate.c          | 14 ++++++++++++++
 src/commonlib/include/commonlib/fsp1_1.h | 16 ----------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/commonlib/fsp1_1_relocate.c b/src/commonlib/fsp1_1_relocate.c
index 7165d86..501c08d 100644
--- a/src/commonlib/fsp1_1_relocate.c
+++ b/src/commonlib/fsp1_1_relocate.c
@@ -16,6 +16,20 @@
 #include <console/console.h>
 #include <commonlib/endian.h>
 #include <commonlib/fsp1_1.h>
+/*
+ * Intel's code does not have a handle on changing global packing state.
+ * Therefore, one needs to protect against packing policies that are set
+ * globally for a compliation unit just by including a header file.
+ */
+#pragma pack(push)
+
+/* Default bind FSP 1.1 API to edk2 UEFI 2.4 types. */
+#include <vendorcode/intel/edk2/uefi_2.4/uefi_types.h>
+#include <vendorcode/intel/fsp/fsp1_1/IntelFspPkg/Include/FspInfoHeader.h>
+
+/* Restore original packing policy. */
+#pragma pack(pop)
+
 #include <commonlib/helpers.h>
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/src/commonlib/include/commonlib/fsp1_1.h b/src/commonlib/include/commonlib/fsp1_1.h
index 3e4fd3e..a5bc193 100644
--- a/src/commonlib/include/commonlib/fsp1_1.h
+++ b/src/commonlib/include/commonlib/fsp1_1.h
@@ -20,22 +20,6 @@
 #include <stdint.h>
 
 /*
- * Intel's code does not have a handle on changing global packing state.
- * Therefore, one needs to protect against packing policies that are set
- * globally for a compliation unit just by including a header file.
- */
-#pragma pack(push)
-
-/* Default bind FSP 1.1 API to edk2 UEFI 2.4 types. */
-#include <vendorcode/intel/edk2/uefi_2.4/uefi_types.h>
-
-#include <vendorcode/intel/fsp/fsp1_1/IntelFspPkg/Include/FspApi.h>
-#include <vendorcode/intel/fsp/fsp1_1/IntelFspPkg/Include/FspInfoHeader.h>
-
-/* Restore original packing policy. */
-#pragma pack(pop)
-
-/*
  * Relocate FSP held within buffer defined by size to new_addr. Returns < 0
  * on error, offset to FSP_INFO_HEADER on success.
  */