tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-28 16:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

UserSpace: Fixed compilation after rebasing upon edk2-stable202502 tag.

Browse Source
This commit is contained in:
Mikhail Krichanov 2025-04-14 21:58:57 +03:00
parent 8a8e617dfe
commit d8204d9779
11 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArmPkg/Library/ArmExceptionLib/Arm/ExceptionSupport.S
View File

@ -11,7 +11,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
#include <Library/PcdLib.h> #include <Library/PcdLib.h>
#include <AsmMacroIoLib.h> #include <AsmMacroLib.h>
/* /*

6
ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S
View File

@ -134,12 +134,10 @@ ASM_FUNC(ArmInvalidateTlb)
ret ret
ASM_FUNC(ArmWriteCptr) ASM_FUNC(ArmWriteCptr)
EL1_OR_EL2_OR_EL3(x1) EL1_OR_EL2(x1)
1:ret 1:ret
2:msr cptr_el2, x0 2:msr cptr_el2, x0
b 4f isb
3:msr cptr_el3, x0 // EL3 Coprocessor Trap Reg (CPTR)
4:isb
ret ret
ASM_FUNC(ArmCallWFE) ASM_FUNC(ArmCallWFE)

2
ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c
View File

@ -8,8 +8,6 @@
**/ **/
#include <Chipset/AArch64.h>
#include <Uefi.h> #include <Uefi.h>
#include <Library/ArmLib.h> #include <Library/ArmLib.h>
#include <Library/UefiLib.h> #include <Library/UefiLib.h>

12
ArmVirtPkg/ArmVirt.dsc.inc
View File

@ -37,7 +37,11 @@
!if $(ARCH) == ARM !if $(ARCH) == ARM
DEFINE CUSTOM_STACK_CHECK_LIB = STATIC DEFINE CUSTOM_STACK_CHECK_LIB = STATIC
!else !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 !endif
[BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]
@ -71,6 +75,8 @@
UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.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 HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
@ -224,6 +230,7 @@
[LibraryClasses.common.DXE_CORE] [LibraryClasses.common.DXE_CORE]
HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
CpuArchLib|ArmPkg/Library/CpuArchLib/CpuArchLib.inf CpuArchLib|ArmPkg/Library/CpuArchLib/CpuArchLib.inf
@ -266,9 +273,6 @@
BaseCryptLib|CryptoPkg/Library/BaseCryptLibMbedTls/BaseCryptLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLibMbedTls/BaseCryptLib.inf
MbedTlsLib|CryptoPkg/Library/MbedTlsLib/MbedTlsLib.inf MbedTlsLib|CryptoPkg/Library/MbedTlsLib/MbedTlsLib.inf
RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.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] [BuildOptions]
GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG

2
MdeModulePkg/Core/Dxe/DxeUserSpace/AARCH64/SysCall.S
View File

@ -3,7 +3,7 @@
// SPDX-License-Identifier: BSD-3-Clause // SPDX-License-Identifier: BSD-3-Clause
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#include <AsmMacroIoLibV8.h> #include <AsmMacroLib.h>
.extern ASM_PFX(UserSpaceCall) .extern ASM_PFX(UserSpaceCall)

2
MdeModulePkg/Core/Dxe/DxeUserSpace/ARM/SysCall.S
View File

@ -3,7 +3,7 @@
// SPDX-License-Identifier: BSD-3-Clause // SPDX-License-Identifier: BSD-3-Clause
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#include <AsmMacroIoLib.h> #include <AsmMacroLib.h>
.extern ASM_PFX(UserSpaceCall) .extern ASM_PFX(UserSpaceCall)

2
MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S
View File

@ -5,7 +5,7 @@
// //
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#include <AsmMacroIoLibV8.h> #include <AsmMacroLib.h>
.cpu cortex-a76 .cpu cortex-a76

1
MdeModulePkg/Core/Dxe/SysCall/AARCH64/InitializeAARCH64.c
View File

@ -5,7 +5,6 @@
**/ **/
#include <Chipset/AArch64.h>
#include <Guid/EarlyPL011BaseAddress.h> #include <Guid/EarlyPL011BaseAddress.h>
#include <Library/ArmLib.h> #include <Library/ArmLib.h>
#include <Library/ArmMmuLib.h> #include <Library/ArmMmuLib.h>

2
MdeModulePkg/Core/Dxe/SysCall/ARM/CoreBootServices.S
View File

@ -5,7 +5,7 @@
// //
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#include <AsmMacroIoLib.h> #include <AsmMacroLib.h>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// EFI_STATUS // EFI_STATUS

6
OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc
View File

@ -62,9 +62,9 @@ DEFINE FW_BLOCKS = 0x400
DEFINE CODE_BASE_ADDRESS = 0xFFC84000 DEFINE CODE_BASE_ADDRESS = 0xFFC84000
DEFINE CODE_SIZE = 0x0037C000 DEFINE CODE_SIZE = 0x0037C000
DEFINE CODE_BLOCKS = 0x37C DEFINE CODE_BLOCKS = 0x37C
DEFINE FVMAIN_SIZE = 0x00340000 DEFINE FVMAIN_SIZE = 0x0033f000
DEFINE SECFV_OFFSET = 0x003C4000 DEFINE SECFV_OFFSET = 0x003C3000
DEFINE SECFV_SIZE = 0x3c000 DEFINE SECFV_SIZE = 0x3d000
!endif !endif
SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress = $(FW_BASE_ADDRESS) SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress = $(FW_BASE_ADDRESS)

4
OvmfPkg/OvmfPkgX64.fdf
View File

@ -103,11 +103,11 @@ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecApicPageTableBase|gUefiOvmfPkgTokenSpaceGui
0x011000|0x00F000 0x011000|0x00F000
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize
0x020000|0x130000 0x020000|0x150000
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvSize gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvSize
FV = PEIFV FV = PEIFV
0x150000|0xE30000 0x170000|0xE10000
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvSize gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvSize
FV = DXEFV FV = DXEFV