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

arm/u-boot: Load dtb if specified, else fall back to u-boot built-in fdt

Browse Source 
Change-Id: Icda4ac4c382770a1adcf593b6cf70f7575880f83
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1894
Reviewed-by: Alex von Gluck IV <[email protected]>
This commit is contained in:
Alexander von Gluck IV
2019-10-02 20:16:28 +00:00
committed by Alex von Gluck IV
parent 1187e80647
commit f17664c8b1
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ArchitectureRules
+3 -4
View File
@@ -257,14 +257,13 @@ rule KernelArchitectureSetup architecture
HAIKU_BOOT_LOADER_BASE ?= 0x1000000 ;
# Modern u-boot fill in sane addresses for us.
# We only need to fill in the FDT dtb
# Leverage the built-in fdt dtb for this board, unless a custom dtb is specified in uEnv.txt
HAIKU_MMC_UBOOT_SCRIPT = "\
test -e mmc 0 uEnv.txt && fatload mmc 0 ${scriptaddr} uEnv.txt && env import -t ${scriptaddr} ${filesize} \
fatload mmc 0 ${kernel_addr_r} haiku_loader.ub \
fatload mmc 0 ${ramdisk_addr_r} haiku_floppyboot.ub \
fatload mmc 0 ${fdt_addr_r} ${dtb} \
fdt addr ${fdt_addr_r} \
bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}" ;
env exists dtb && fatload mmc 0 ${fdt_addr_r} ${dtb} && fdt addr ${fdt_addr_r} && bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r} \
fdt addr ${fdtcontroladdr} && bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdtcontroladdr}" ;
case arm64 :
HAIKU_KERNEL_PLATFORM ?= efi ;