summaryrefslogtreecommitdiff
path: root/src/commonlib
diff options
context:
space:
mode:
authorSubrata Banik <subratabanik@google.com>2024-04-01 23:44:43 +0530
committerSubrata Banik <subratabanik@google.com>2024-04-04 06:29:40 +0000
commit698fa27e82e6f83467bb5bcc777741b10e674abb (patch)
tree6d6605375ce4737645eb3039869a7f51d3737d08 /src/commonlib
parenta6dfbeedff74bd2564642a845c3419044553057e (diff)
commonlib: Simplify FSP header inclusion
Include `fsp_header.h` from vendorcode for dynamic FSP_INFO_HEADER selection. BUG=b:242829490 TEST=google/rex0 builds successfully with 64-bit FSP. Change-Id: If165e0517752f320d898cf82f298aa9f5699ae86 Signed-off-by: Subrata Banik <subratabanik@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/81624 Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/commonlib')
-rw-r--r--src/commonlib/fsp_relocate.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/commonlib/fsp_relocate.c b/src/commonlib/fsp_relocate.c
index 96d31b3ea6..f57e278cf0 100644
--- a/src/commonlib/fsp_relocate.c
+++ b/src/commonlib/fsp_relocate.c
@@ -4,24 +4,11 @@
#include <commonlib/endian.h>
#include <commonlib/fsp.h>
#include <inttypes.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 compilation 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 <stddef.h>
#include <stdint.h>
#include <string.h>
+#include <vendorcode/intel/fsp/fsp_header.h>
#define FSP_DBG_LVL BIOS_NEVER
#define MASK_24BITS 0x00FFFFFF