From 7127c048dbb8901853281fafe3b7de3af35a0d59 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Tue, 30 Jun 2020 09:13:48 +0200 Subject: [PATCH] u-boot/arm: simplify device tree handling By updating $fdt_addr_r we can simplify boot-arm.scr.txt. Now we can explicitly pass the device tree address to bootefi instead of relying on a fallback inside U-Boot. Signed-off-by: Heinrich Schuchardt Change-Id: Ifceb574aca2814605a2e4e58e9187773817c5df2 Reviewed-on: https://review.haiku-os.org/c/haiku/+/2970 Reviewed-by: Adrien Destugues Reviewed-by: Alex von Gluck IV Tested-by: Commit checker robot --- data/boot/u-boot/boot-arm.scr.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/data/boot/u-boot/boot-arm.scr.txt b/data/boot/u-boot/boot-arm.scr.txt index 1241222661..01fae1c400 100644 --- a/data/boot/u-boot/boot-arm.scr.txt +++ b/data/boot/u-boot/boot-arm.scr.txt @@ -11,9 +11,8 @@ test -e ${media} 0 ${loader} && echo "Found ${loader} on ${media} 0!" echo "Loading bootloader..." fatload ${media} 0 ${kernel_addr_r} ${loader} test -e ${media} 0 haiku_floppyboot.ub && fatload ${media} 0 ${ramdisk_addr_r} haiku_floppyboot.ub -env exists dtb && echo "Using custom DTB..." && fatload ${media} 0 ${fdt_addr_r} ${dtb} && fdt addr ${fdt_addr_r} -env exists dtb || echo "Using internal DTB..." && fdt addr ${fdtcontroladdr} -test "${platform}" = "efi" && echo "Launching EFI loader..." && bootefi ${kernel_addr_r} -test "${platform}" = "u-boot" && env exists dtb && echo "Launching ub loader..." && bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdtcontroladdr} -test "${platform}" = "u-boot" && env exists dtb || echo "Launching ub loader (w/custom fdt)..." && bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r} +env exists dtb && echo "Using custom DTB..." && fatload ${media} 0 ${fdt_addr_r} ${dtb} +env exists dtb || echo "Using internal DTB..." && setenv fdt_addr_r ${fdtcontroladdr} +test "${platform}" = "efi" && echo "Launching EFI loader..." && bootefi ${kernel_addr_r} ${fdt_addr_r} +test "${platform}" = "u-boot" && echo "Launching ub loader..." && bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r} echo "Haiku u-boot script fell through!" && exit