| Message ID | 1462474687-19709-2-git-send-email-ashcharles@gmail.com |
|---|---|
| State | Accepted |
| Commit | ea948590a3e0bd08021f110db9784a6d201ea810 |
| Delegated to: | Tom Rini |
| Headers | show |
On Thu, May 05, 2016 at 11:58:06AM -0700, Ash Charles wrote: > Be sure to load the zImage and fdtfile prior to actually booting in > case we are doing a legacy boot. > > Signed-off-by: Ash Charles <ashcharles@gmail.com> Applied to u-boot/master, thanks!
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 586d848..5fad3c1 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -122,7 +122,10 @@ "loaduimage=load mmc ${mmcdev} ${loadaddr} uImage\0" \ "mmcboot=echo Booting from mmc${mmcdev} ...; " \ "run args_mmc; " \ - "bootz ${loadaddr} - ${fdtaddr}\0" \ + "if run loadimage; then " \ + "run loadfdt; " \ + "bootz ${loadaddr} - ${fdtaddr}; " \ + "fi;\0" \ "uimageboot=echo Booting from mmc${mmcdev} ...; " \ "run args_mmc; " \ "bootm ${loadaddr}\0" \
Be sure to load the zImage and fdtfile prior to actually booting in case we are doing a legacy boot. Signed-off-by: Ash Charles <ashcharles@gmail.com> --- include/configs/ti_omap4_common.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)