From: Alexei Fedorov <alexei.fedo...@arm.com> UEFI build fails for ArmVExpress-FVP-AArch64 when using "-D ARM_FVP_RUN_NORFLASH" build option, which prevents EDK2_SKIP_PEICORE macro from being defined in ArmVExpress-FVP-AArch64.dsc:
!ifndef ARM_FVP_RUN_NORFLASH DEFINE EDK2_SKIP_PEICORE=1 !endif When EDK2_SKIP_PEICORE macro is not defined, build fails with errors 1001: Module type [PEI_CORE] is not supported by library instance [MdeModulePkg\Library\DxeReportStatusCodeLib\DxeReportStatusCodeLib.inf] consumed by [n:\edk2\MdeModulePkg\Core\Pei\PeiMain.inf] Module type [PEIM] is not supported by library instance [MdeModulePkg\Library\DxeReportStatusCodeLib\DxeReportStatusCodeLib.inf] consumed by [n:\edk2\MdeModulePkg\Core\DxeIplPeim\DxeIpl.inf] and ../Platform/ARM/VExpressPkg/Include/Platform/RTSM/ArmPlatform.h:19:10: fatal error: VExpressMotherBoard.h: No such file or directory This patch fixes the above build errors by adding MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf in [LibraryClasses.common.PEI_CORE] and [LibraryClasses.common.PEIM] sections of ArmVExpress.dsc.inc and Platform/ARM/VExpressPkg/ArmVExpressPkg.dec in [Packages] section of ArmVExpressLibSec.inf Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Alexei Fedorov <alexei.fedo...@arm.com> --- All the changes can be reviewed at: https://github.com/AlexeiFedorov/edk2-platforms/tree/237_fix_fvp_build_v1 Notes: v1: Add PeiReportStatusCodeLib in PEI_CORE and PEIM sections [Alexei] Add ArmVExpressPkg.dec in ArmVExpressLibSec.inf [Alexei] Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 2 ++ Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index de201b0c81d020e1e06ee320cf0f14f186723657..bb899b91c525ee821b9506cca75224f4bc41e3ae 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -166,6 +166,7 @@ [LibraryClasses.common.PEI_CORE] MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf + ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf @@ -179,6 +180,7 @@ [LibraryClasses.common.PEIM] MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf + ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf PeiResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf index 2287756cf8c5f988ac1fe85485f242407ebffa67..ec29d99835401b65f45ff494df4a0955a1618af1 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf @@ -1,5 +1,5 @@ #/* @file -# Copyright (c) 2011-2012, ARM Limited. All rights reserved. +# Copyright (c) 2011-2018, ARM Limited. All rights reserved. # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -22,6 +22,7 @@ [Defines] [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec + Platform/ARM/VExpressPkg/ArmVExpressPkg.dec EmbeddedPkg/EmbeddedPkg.dec ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
