diff options
Diffstat (limited to 'src/vendorcode/intel')
| -rw-r--r-- | src/vendorcode/intel/Kconfig | 3 | ||||
| -rw-r--r-- | src/vendorcode/intel/Makefile.inc | 10 | ||||
| -rw-r--r-- | src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h | 18 |
3 files changed, 22 insertions, 9 deletions
diff --git a/src/vendorcode/intel/Kconfig b/src/vendorcode/intel/Kconfig index 0da26f0fbd..754c48716c 100644 --- a/src/vendorcode/intel/Kconfig +++ b/src/vendorcode/intel/Kconfig @@ -22,3 +22,6 @@ config FSP_VENDORCODE_HEADER_PATH default "fsp1_0/ivybridge_bd82x6x" if CPU_INTEL_FSP_MODEL_306AX && SOUTHBRIDGE_INTEL_FSP_BD82X6X default "fsp1_0/baytrail" if SOC_INTEL_FSP_BAYTRAIL default "fsp1_0/rangeley" if CPU_INTEL_FSP_MODEL_406DX + +config UEFI_2_4_BINDING + def_bool n diff --git a/src/vendorcode/intel/Makefile.inc b/src/vendorcode/intel/Makefile.inc index 2cb486b599..b95d4f9c76 100644 --- a/src/vendorcode/intel/Makefile.inc +++ b/src/vendorcode/intel/Makefile.inc @@ -25,3 +25,13 @@ ramstage-y += $(FSP_C_INPUTS) CFLAGS_x86_32 += -Isrc/vendorcode/intel/$(FSP_PATH)/include endif + +ifeq ($(CONFIG_UEFI_2_4_BINDING),y) +# ProccessorBind.h provided in Ia32 directory. Types are derived from ia32. +# It's possible to provide our own ProcessorBind.h using posix types. However, +# ProcessorBind.h isn't just about types. There's compiler definitions as well +# as ABI enforcement. Luckily long is not used in Ia32/ProcessorBind.h for +# a fixed width type. +CPPFLAGS_common += -I$(src)/vendorcode/intel/edk2/uefi_2.4/MdePkg/Include/Ia32 +CPPFLAGS_common += -I$(src)/vendorcode/intel/edk2/uefi_2.4/MdePkg/Include +endif diff --git a/src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h b/src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h index e17361ed0c..e68f8c9fb0 100644 --- a/src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h +++ b/src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h @@ -37,15 +37,15 @@ are permitted provided that the following conditions are met: #define __APPLE__ 0 #include <stdlib.h> #include <Uefi/UefiBaseType.h> -#include <MdePkg/Include/Pi/PiBootMode.h> -#include <MdePkg/Include/Pi/PiFirmwareFile.h> -#include <MdePkg/Include/Pi/PiFirmwareVolume.h> -#include <MdePkg/Include/Uefi/UefiMultiPhase.h> -#include <MdePkg/Include/Pi/PiHob.h> -#include <MdePkg/Include/Protocol/GraphicsOutput.h> -#include <MdePkg/Include/Library/HobLib.h> -#include <MdePkg/Include/Guid/FirmwareFileSystem2.h> -#include <MdePkg/Include/IndustryStandard/PeImage.h> +#include <Pi/PiBootMode.h> +#include <Pi/PiFirmwareFile.h> +#include <Pi/PiFirmwareVolume.h> +#include <Uefi/UefiMultiPhase.h> +#include <Pi/PiHob.h> +#include <Protocol/GraphicsOutput.h> +#include <Library/HobLib.h> +#include <Guid/FirmwareFileSystem2.h> +#include <IndustryStandard/PeImage.h> /// /// For GNU assembly code, .global or .globl can declare global symbols. |