forked from pool/u-boot
78ade92333
Fix boot.scr location for beagle and origen (forwarded request 221006 from Guillaume_G) OBS-URL: https://build.opensuse.org/request/show/221007 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=23
30 lines
1002 B
Diff
30 lines
1002 B
Diff
--- include/configs/omap3_beagle.h.orig 2013-11-21 15:44:37.041667288 +0100
|
|
+++ include/configs/omap3_beagle.h 2013-11-21 15:47:25.589580653 +0100
|
|
@@ -264,6 +264,9 @@
|
|
"rootfstype=${ramrootfstype}\0" \
|
|
"loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \
|
|
"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
|
|
+ "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
|
|
+ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
|
|
+ "source ${loadaddr}\0" \
|
|
"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
|
|
"mmcboot=echo Booting from mmc ...; " \
|
|
"run mmcargs; " \
|
|
@@ -300,9 +303,13 @@
|
|
"echo Running uenvcmd ...;" \
|
|
"run uenvcmd;" \
|
|
"fi;" \
|
|
- "if run loadimage; then " \
|
|
- "run mmcboot;" \
|
|
- "fi;" \
|
|
+ "if run loadbootscript; then " \
|
|
+ "run bootscript; " \
|
|
+ "else " \
|
|
+ "if run loadimage; then " \
|
|
+ "run mmcboot;" \
|
|
+ "fi;" \
|
|
+ "fi; " \
|
|
"fi;" \
|
|
"run nandboot;" \
|
|
"setenv bootfile zImage;" \
|