From 68d28424cf41e141207d9d8af76c5bc5e01a55e2 Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Wed, 9 Feb 2022 16:37:17 +0100 Subject: [PATCH] HW17: Add bootcmds for ostree BugzID: 77953 --- include/configs/armada-385-hw17.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/configs/armada-385-hw17.h b/include/configs/armada-385-hw17.h index 50b8117f32..f56db5fe3a 100644 --- a/include/configs/armada-385-hw17.h +++ b/include/configs/armada-385-hw17.h @@ -119,7 +119,10 @@ "else run sdbringup; fi; " \ "run add_sd_bootargs; run add_version_bootargs; " \ "bootz $kernel_addr - $fdt_addr; fi\0" \ - "bootcmd=run sdboot\0" \ + "bootcmd=run boot_ostree || run sdboot\0" \ + "boot_ostree=run bootcmd_otenv && run bootcmd_rd_in_mmc\0" \ + "bootcmd_otenv=ext4load mmc 0:1 $load_addr /boot/loader/uEnv.txt && setenv bootargs_prev $bootargs; env import -t $load_addr $filesize && setenv bootargs $bootargs_prev $bootargs root=/dev/ram0 console=$defaultconsole,115200 $ethopts rw ostree_root=/dev/mmcblk0p1\0" \ + "bootcmd_rd_in_mmc=ext4load mmc 0:1 $kernel_addr_r /boot$kernel_image && nbhw_fpga program lattice 0xffffffff $kernel_addr_r && nbhw_fpga configure && bootm $kernel_addr_r\0" \ "ipaddr=192.168.1.1\0" \ "serverip=192.168.1.254\0" \ "pxefile_addr_r=" PXE_ADDR "\0" \