Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-28 19:32:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELOADER] Fix build with full UEFI support

Browse source
This commit is contained in:
Justin Miller 2023-10-12 18:41:20 -07:00
parent cf2818762d
commit 5cf3dbabb0
4 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
boot/freeldr/freeldr/arch/uefi/arm64/uefiasm.S Normal file
View file

@ -0,0 +1,20 @@
#include <kxarm64.h>
EXTERN BasicStack
EXTERN UefiExitBootServices
EXTERN ExecuteLoaderCleanly
NESTED_ENTRY _changestack
PROLOG_END _changestack
ldr x1, =BasicStack
mov sp, x1
b ExecuteLoaderCleanly
NESTED_END _changestack
NESTED_ENTRY _exituefi
PROLOG_END _exituefi
b UefiExitBootServices
ret
NESTED_END _exituefi
END

8
boot/freeldr/freeldr/arch/uefi/uefihw.c
View file

@ -23,7 +23,7 @@ extern UINT32 FreeldrDescCount;
BOOLEAN AcpiPresent = FALSE; BOOLEAN AcpiPresent = FALSE;
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
#if 0
static static
PRSDP_DESCRIPTOR PRSDP_DESCRIPTOR
FindAcpiBios(VOID) FindAcpiBios(VOID)
@ -122,11 +122,13 @@ DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber)
} }
} }
#endif
PCONFIGURATION_COMPONENT_DATA PCONFIGURATION_COMPONENT_DATA
UefiHwDetect(VOID) UefiHwDetect(VOID)
{ {
PCONFIGURATION_COMPONENT_DATA SystemKey; PCONFIGURATION_COMPONENT_DATA SystemKey;
ULONG BusNumber = 0; //ULONG BusNumber = 0;
TRACE("DetectHardware()\n"); TRACE("DetectHardware()\n");
@ -142,7 +144,7 @@ UefiHwDetect(VOID)
#endif #endif
/* Detect ACPI */ /* Detect ACPI */
DetectAcpiBios(SystemKey, &BusNumber); // DetectAcpiBios(SystemKey, &BusNumber);
TRACE("DetectHardware() Done\n"); TRACE("DetectHardware() Done\n");
return SystemKey; return SystemKey;

1
boot/freeldr/freeldr/arch/uefi/uefildr.c
View file

@ -18,6 +18,7 @@ PVOID UefiServiceStack;
PVOID BasicStack; PVOID BasicStack;
void _changestack(VOID); void _changestack(VOID);
VOID __cdecl Reboot(VOID);
/* FUNCTIONS ******************************************************************/ /* FUNCTIONS ******************************************************************/

2
boot/freeldr/freeldr/uefi.cmake
View file

@ -40,6 +40,8 @@ elseif(ARCH STREQUAL "arm")
elseif(ARCH STREQUAL "arm64") elseif(ARCH STREQUAL "arm64")
list(APPEND UEFILDR_ARC_SOURCE list(APPEND UEFILDR_ARC_SOURCE
arch/arm64/mach.c) arch/arm64/mach.c)
list(APPEND UEFILDR_COMMON_ASM_SOURCE
arch/uefi/arm64/uefiasm.S)
#TBD #TBD
else() else()
#TBD #TBD