e6bf81de08
1 OBS-URL: https://build.opensuse.org/request/show/248054 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=29
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
Index: include/configs/omap3_beagle.h
|
|
===================================================================
|
|
--- include/configs/omap3_beagle.h.orig
|
|
+++ include/configs/omap3_beagle.h
|
|
@@ -193,7 +193,7 @@
|
|
"fi; " \
|
|
"fi; \0" \
|
|
"bootenv=uEnv.txt\0" \
|
|
- "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
|
|
+ "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
|
|
"importbootenv=echo Importing environment from mmc ...; " \
|
|
"env import -t -r $loadaddr $filesize\0" \
|
|
"ramargs=setenv bootargs console=${console} " \
|
|
@@ -207,6 +207,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=run validatefdt; load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
|
|
"mmcboot=echo Booting from mmc ...; " \
|
|
"run mmcargs; " \
|
|
@@ -243,9 +246,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;" \
|