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>
This commit is contained in:
Stefan Reinauer 2016-01-30 02:05:56 -08:00 committed by Martin Roth
parent 0d473512c7
commit f76ceea705
2 changed files with 14 additions and 16 deletions

View File

@ -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>

View File

@ -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.