From f76ceea7051a29883fdaab16e5879f5f742384e5 Mon Sep 17 00:00:00 2001
From: Stefan Reinauer <stefan.reinauer@coreboot.org>
Date: Sat, 30 Jan 2016 02:05:56 -0800
Subject: 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@coreboot.org>
Reviewed-on: https://review.coreboot.org/13526
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
---
 src/commonlib/fsp1_1_relocate.c          | 14 ++++++++++++++
 src/commonlib/include/commonlib/fsp1_1.h | 16 ----------------
 2 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/commonlib/fsp1_1_relocate.c b/src/commonlib/fsp1_1_relocate.c
index 7165d862c7..501c08d3c9 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 3e4fd3eb40..a5bc193ed2 100644
--- a/src/commonlib/include/commonlib/fsp1_1.h
+++ b/src/commonlib/include/commonlib/fsp1_1.h
@@ -19,22 +19,6 @@
 #include <stddef.h>
 #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.
-- 
cgit v1.2.3