Rather than guess what we need to name our u-boot.bin file as for it to
boot make use of the kernel= option to always call it u-boot.bin and
then on 64bit platforms (and since future platforms use rpi_arm64 this
list should not grow) also pass in arm_64bit=1.
Signed-off-by: Tom Rini <tr...@konsulko.com>
---
bin/writer.rpi_mount | 25 ++++++-------------------
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git a/bin/writer.rpi_mount b/bin/writer.rpi_mount
index 73fb8bf6af04..ab7c3b5a2430 100755
--- a/bin/writer.rpi_mount
+++ b/bin/writer.rpi_mount
@@ -25,30 +25,17 @@ build=${U_BOOT_BUILD_DIR}
echo "Writing to ${mount_dir} from build at ${build}"
+sudo cp -v ${build}/u-boot.bin ${mount_dir}/u-boot.bin
+
+echo "enable_uart=1" | sudo tee ${mount_dir}/config.txt
+echo "kernel=u-boot.bin" | sudo tee -a ${mount_dir}/config.txt
+
case "${board_type}" in
-rpi)
- kernel_dst=kernel.img
- ;;
-rpi_2)
- kernel_dst=kernel7.img
- ;;
rpi_3|rpi_3b|rpi_3_b_plus|rpi_4|rpi_arm64)
- kernel_dst=kernel8.img
- ;;
-rpi_3_32b|rpi_4_32b)
- kernel_dst=kernel8-32.img
- ;;
-*)
- echo Unknown Pi \""${board_type}"\"
- exit 1
+ echo "arm_64bit=1" | sudo tee -a ${mount_dir}/config.txt
;;
esac
-sudo rm -f ${mount_dir}/kernel*img
-sudo cp -v ${build}/u-boot.bin ${mount_dir}/${kernel_dst}
-
-echo "enable_uart=1" | sudo tee ${mount_dir}/config.txt
-
case "${board_ident}" in
3-32-pl011)
echo "dtoverlay=pi3-miniuart-bt" | sudo tee -a ${mount_dir}/config.txt
--
2.34.1
