i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

system/boot/efi: Tweaks to get arm efi further

Browse Source 
* Store gFDT as a global in efi to appease non-x86
* gFDT might need refactored out of fdt bus_manager?

Change-Id: I3fb1be04ceb696677aa5476381786c36adc6fc0a
This commit is contained in:
Alexander von Gluck IV
2020-03-09 11:34:47 -05:00
parent 40c4917414
commit 9b91a310bf
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/efi/arch/arm/Jamfile
+1
View File
@@ -10,6 +10,7 @@ local arch_src =
#entry.S #entry.S
relocation_func.cpp relocation_func.cpp
arch_smp.cpp arch_smp.cpp
arch_start.cpp
arch_mmu.cpp arch_mmu.cpp
arch_timer.cpp arch_timer.cpp
; ;
src/system/boot/platform/efi/arch/arm/relocation_func.cpp
+1 -1
View File
@@ -39,7 +39,7 @@
#include <elf.h> #include <elf.h>
efi_status _relocate(long ldbase, Elf32_Dyn *dyn, extern "C" efi_status _relocate(long ldbase, Elf32_Dyn *dyn,
efi_handle image __attribute__((__unused__)), efi_handle image __attribute__((__unused__)),
efi_system_table *systab __attribute__((__unused__))) efi_system_table *systab __attribute__((__unused__)))
{ {
src/system/boot/platform/efi/start.cpp
+2 -1
View File
@@ -43,7 +43,7 @@ efi_handle kImage;
static uint32 sBootOptions; static uint32 sBootOptions;
void* gFDT;
extern "C" int main(stage2_args *args); extern "C" int main(stage2_args *args);
extern "C" void _start(void); extern "C" void _start(void);
@@ -177,6 +177,7 @@ extern "C" efi_status
efi_main(efi_handle image, efi_system_table *systemTable) efi_main(efi_handle image, efi_system_table *systemTable)
{ {
stage2_args args; stage2_args args;
gFDT = NULL;
memset(&args, 0, sizeof(stage2_args)); memset(&args, 0, sizeof(stage2_args));