diff --git a/ArmPkg/Library/ArmExceptionLib/Arm/ExceptionSupport.S b/ArmPkg/Library/ArmExceptionLib/Arm/ExceptionSupport.S index ed6895a0ff..1a674db46d 100644 --- a/ArmPkg/Library/ArmExceptionLib/Arm/ExceptionSupport.S +++ b/ArmPkg/Library/ArmExceptionLib/Arm/ExceptionSupport.S @@ -11,7 +11,7 @@ #------------------------------------------------------------------------------ #include -#include +#include /* diff --git a/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S b/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S index 0a25ed5b39..ccb2fce94d 100644 --- a/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S +++ b/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S @@ -134,12 +134,10 @@ ASM_FUNC(ArmInvalidateTlb) ret ASM_FUNC(ArmWriteCptr) - EL1_OR_EL2_OR_EL3(x1) + EL1_OR_EL2(x1) 1:ret 2:msr cptr_el2, x0 - b 4f -3:msr cptr_el3, x0 // EL3 Coprocessor Trap Reg (CPTR) -4:isb + isb ret ASM_FUNC(ArmCallWFE) diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c b/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c index e2a32fe15f..7631c14b54 100644 --- a/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c +++ b/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c @@ -8,8 +8,6 @@ **/ -#include - #include #include #include diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 87090a5e2a..88a9ed3958 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -37,7 +37,11 @@ !if $(ARCH) == ARM DEFINE CUSTOM_STACK_CHECK_LIB = STATIC !else - DEFINE CUSTOM_STACK_CHECK_LIB = DYNAMIC + !ifdef $(USER_SPACE) + DEFINE CUSTOM_STACK_CHECK_LIB = STATIC + !else + DEFINE CUSTOM_STACK_CHECK_LIB = DYNAMIC + !endif !endif [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] @@ -71,6 +75,8 @@ UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf + UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf + UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf @@ -224,6 +230,7 @@ [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf + DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf CpuArchLib|ArmPkg/Library/CpuArchLib/CpuArchLib.inf @@ -266,9 +273,6 @@ BaseCryptLib|CryptoPkg/Library/BaseCryptLibMbedTls/BaseCryptLib.inf MbedTlsLib|CryptoPkg/Library/MbedTlsLib/MbedTlsLib.inf RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf - UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf - UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf - DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf [BuildOptions] GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG diff --git a/MdeModulePkg/Core/Dxe/DxeUserSpace/AARCH64/SysCall.S b/MdeModulePkg/Core/Dxe/DxeUserSpace/AARCH64/SysCall.S index 1940441d71..226ebb61d1 100644 --- a/MdeModulePkg/Core/Dxe/DxeUserSpace/AARCH64/SysCall.S +++ b/MdeModulePkg/Core/Dxe/DxeUserSpace/AARCH64/SysCall.S @@ -3,7 +3,7 @@ // SPDX-License-Identifier: BSD-3-Clause //------------------------------------------------------------------------------ -#include +#include .extern ASM_PFX(UserSpaceCall) diff --git a/MdeModulePkg/Core/Dxe/DxeUserSpace/ARM/SysCall.S b/MdeModulePkg/Core/Dxe/DxeUserSpace/ARM/SysCall.S index e016a71b16..775b5727e1 100644 --- a/MdeModulePkg/Core/Dxe/DxeUserSpace/ARM/SysCall.S +++ b/MdeModulePkg/Core/Dxe/DxeUserSpace/ARM/SysCall.S @@ -3,7 +3,7 @@ // SPDX-License-Identifier: BSD-3-Clause //------------------------------------------------------------------------------ -#include +#include .extern ASM_PFX(UserSpaceCall) diff --git a/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S b/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S index 65847f9014..c4b38a4bef 100644 --- a/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S +++ b/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S @@ -5,7 +5,7 @@ // //------------------------------------------------------------------------------ -#include +#include .cpu cortex-a76 diff --git a/MdeModulePkg/Core/Dxe/SysCall/AARCH64/InitializeAARCH64.c b/MdeModulePkg/Core/Dxe/SysCall/AARCH64/InitializeAARCH64.c index 13a5e2a983..44291393fb 100644 --- a/MdeModulePkg/Core/Dxe/SysCall/AARCH64/InitializeAARCH64.c +++ b/MdeModulePkg/Core/Dxe/SysCall/AARCH64/InitializeAARCH64.c @@ -5,7 +5,6 @@ **/ -#include #include #include #include diff --git a/MdeModulePkg/Core/Dxe/SysCall/ARM/CoreBootServices.S b/MdeModulePkg/Core/Dxe/SysCall/ARM/CoreBootServices.S index 9191e3b0ad..54973efa44 100644 --- a/MdeModulePkg/Core/Dxe/SysCall/ARM/CoreBootServices.S +++ b/MdeModulePkg/Core/Dxe/SysCall/ARM/CoreBootServices.S @@ -5,7 +5,7 @@ // //------------------------------------------------------------------------------ -#include +#include //------------------------------------------------------------------------------ // EFI_STATUS diff --git a/OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc b/OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc index 062a154cda..11a33a8c7a 100644 --- a/OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc +++ b/OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc @@ -62,9 +62,9 @@ DEFINE FW_BLOCKS = 0x400 DEFINE CODE_BASE_ADDRESS = 0xFFC84000 DEFINE CODE_SIZE = 0x0037C000 DEFINE CODE_BLOCKS = 0x37C -DEFINE FVMAIN_SIZE = 0x00340000 -DEFINE SECFV_OFFSET = 0x003C4000 -DEFINE SECFV_SIZE = 0x3c000 +DEFINE FVMAIN_SIZE = 0x0033f000 +DEFINE SECFV_OFFSET = 0x003C3000 +DEFINE SECFV_SIZE = 0x3d000 !endif SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress = $(FW_BASE_ADDRESS) diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 66e5e90b95..f6095ec570 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -103,11 +103,11 @@ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecApicPageTableBase|gUefiOvmfPkgTokenSpaceGui 0x011000|0x00F000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize -0x020000|0x130000 +0x020000|0x150000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvSize FV = PEIFV -0x150000|0xE30000 +0x170000|0xE10000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvSize FV = DXEFV