Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

system/boot: Fix u-boot build under arm

Browse Source 
Change-Id: Ie10acfd10e8feab71660f99938cbb5bbab565772
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3618
Reviewed-by: Alex von Gluck IV <kallisti5@unixzen.com>
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
This commit is contained in:
Alexander von Gluck IV 2021-01-10 09:53:14 -06:00 committed by Alex von Gluck IV
parent f377a91a31
commit 1ccfdb2bd5
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/system/boot/arch/riscv64/Jamfile
View File

@ -22,11 +22,6 @@ local kernelDebugSources =
local kernelArchDriverSources =
arch_elf.cpp
# Serial UART Drivers
#arch_uart_8250.cpp
#arch_uart_8250_omap.cpp
#arch_uart_pl011.cpp
;
local kernelGenericDriverSources =

11
src/system/boot/platform/u-boot/arch/arm/Jamfile
View File

@ -13,6 +13,13 @@ UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_KERNEL_ARCH) ]
SubDirC++Flags -fno-rtti ;
# Things we borrow from the kernel due to lack of bios services
local kernelArchDriverSources =
#arch_uart_8250.cpp
arch_uart_8250_omap.cpp
arch_uart_pl011.cpp
;
BootMergeObject boot_platform_u-boot_arm.o :
# must come first to have _start_* at correct locations
shell.S
@ -26,6 +33,8 @@ BootMergeObject boot_platform_u-boot_arm.o :
arch_framebuffer_omap3.cpp
arch_framebuffer_pxa.cpp
$(kernelArchDriverSources)
# Mailbox drivers
arch_mailbox_bcm2835.cpp
@ -33,5 +42,7 @@ BootMergeObject boot_platform_u-boot_arm.o :
arch_mmu.cpp
;
SEARCH on [ FGristFiles $(kernelArchDriverSources) ]
= [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ;
#SEARCH on [ FGristFiles arch_cpu_asm.S ]
# = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ;