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

u-boot: Fix boot arch + platform on arm

Browse Source 
Change-Id: I6ecdb9e1b1039ac769b015fb96a3531715b44542
This commit is contained in:
Alexander von Gluck IV
2018-10-30 14:51:15 -05:00
parent d1f8f8301c
commit c340bfce91
2 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/arch/arm/Jamfile
+37 -39
View File
@@ -4,14 +4,6 @@ UseLibraryHeaders [ FDirName libfdt ] ;
UsePrivateHeaders [ FDirName kernel platform $(TARGET_BOOT_PLATFORM) ] ; UsePrivateHeaders [ FDirName kernel platform $(TARGET_BOOT_PLATFORM) ] ;
SubDirHdrs $(HAIKU_TOP) src add-ons kernel bus_managers fdt ; SubDirHdrs $(HAIKU_TOP) src add-ons kernel bus_managers fdt ;
{
local defines = _BOOT_MODE ;
defines = [ FDefines $(defines) ] ;
SubDirCcFlags $(defines) ;
SubDirC++Flags $(defines) -fno-rtti -std=c++1y ;
}
# TODO: Is there any reason to recompile arch_string.S here? # TODO: Is there any reason to recompile arch_string.S here?
local librootArchObjects = local librootArchObjects =
# <src!system!libroot!posix!string!arch!$(TARGET_ARCH)>arch_string.o # <src!system!libroot!posix!string!arch!$(TARGET_ARCH)>arch_string.o
@@ -39,43 +31,49 @@ local kernelGenericDriverSources =
debug_uart_8250.cpp debug_uart_8250.cpp
; ;
BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o : local platform ;
# Kernel Drivers (src/system/kernel) for platform in [ MultiBootSubDirSetup u-boot efi ] {
$(kernelGenericDriverSources) on $(platform) {
$(kernelArchDriverSources) DEFINES += _BOOT_MODE ;
BootMergeObject [ FGristFiles boot_arch_$(TARGET_KERNEL_ARCH).o ] :
# Kernel Drivers (src/system/kernel)
$(kernelGenericDriverSources)
$(kernelArchDriverSources)
# Framebuffer Drivers # Framebuffer Drivers
arch_framebuffer_920.cpp arch_framebuffer_920.cpp
arch_framebuffer_bcm2835.cpp arch_framebuffer_bcm2835.cpp
arch_framebuffer_pxa.cpp arch_framebuffer_pxa.cpp
arch_framebuffer_omap3.cpp arch_framebuffer_omap3.cpp
# Mailbox drivers # Mailbox drivers
arch_mailbox_bcm2835.cpp arch_mailbox_bcm2835.cpp
arch_elf.cpp arch_elf.cpp
arch_cpu.cpp arch_cpu.cpp
arch_mmu.cpp arch_mmu.cpp
arch_start_kernel.S arch_start_kernel.S
# Reuse a subset of kernel debugging. # Reuse a subset of kernel debugging.
kernel_stubs.cpp kernel_stubs.cpp
$(kernelDebugSources) $(kernelDebugSources)
$(librootArchObjects) $(librootArchObjects)
: :
: :
$(kernelLibArchObjects) $(kernelLibArchObjects)
; ;
SEARCH on [ FGristFiles arch_elf.cpp $(kernelArchDriverSources) ]
= [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ;
SEARCH on [ FGristFiles arch_elf.cpp $(kernelArchDriverSources) ] SEARCH on [ FGristFiles $(kernelGenericDriverSources) ]
= [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_KERNEL_ARCH) ] ; = [ FDirName $(HAIKU_TOP) src system kernel arch generic ] ;
SEARCH on [ FGristFiles $(kernelGenericDriverSources) ] SEARCH on [ FGristFiles $(librootArchObjects) ]
= [ FDirName $(HAIKU_TOP) src system kernel arch generic ] ; = [ FDirName $(HAIKU_TOP) src system libroot posix string arch $(TARGET_ARCH) ] ;
SEARCH on [ FGristFiles $(librootArchObjects) ] SEARCH on [ FGristFiles $(kernelDebugSources) ]
= [ FDirName $(HAIKU_TOP) src system libroot posix string arch $(TARGET_ARCH) ] ; = [ FDirName $(HAIKU_TOP) src system kernel debug ] ;
}
}
SEARCH on [ FGristFiles $(kernelDebugSources) ]
= [ FDirName $(HAIKU_TOP) src system kernel debug ] ;
src/system/boot/platform/u-boot/Jamfile
+1 -1
View File
@@ -53,7 +53,7 @@ for platform in [ MultiBootSubDirSetup u-boot ] {
$(genericPlatformSources) $(genericPlatformSources)
: :
: :
boot_platform_generic.a boot_platform_generic_u-boot.a
boot_fdt.a boot_fdt.a
; ;