8f7646648a
fix am335x patch to look for bootscript in proper place (forwarded request 213166 from matwey) OBS-URL: https://build.opensuse.org/request/show/213168 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=18
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
Index: u-boot-2013.10/include/configs/am335x_evm.h
|
|
===================================================================
|
|
--- u-boot-2013.10.orig/include/configs/am335x_evm.h
|
|
+++ u-boot-2013.10/include/configs/am335x_evm.h
|
|
@@ -97,6 +97,9 @@
|
|
"nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
|
|
"ip=dhcp\0" \
|
|
"bootenv=uEnv.txt\0" \
|
|
+ "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
|
|
+ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
|
|
+ "source ${loadaddr}\0" \
|
|
"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
|
|
"importbootenv=echo Importing environment from mmc ...; " \
|
|
"env import -t $loadaddr $filesize\0" \
|
|
@@ -125,17 +128,21 @@
|
|
"mmcboot=mmc dev ${mmcdev}; " \
|
|
"if mmc rescan; then " \
|
|
"echo SD/MMC found on device ${mmcdev};" \
|
|
- "if run loadbootenv; then " \
|
|
- "echo Loaded environment from ${bootenv};" \
|
|
- "run importbootenv;" \
|
|
- "fi;" \
|
|
- "if test -n $uenvcmd; then " \
|
|
- "echo Running uenvcmd ...;" \
|
|
- "run uenvcmd;" \
|
|
- "fi;" \
|
|
- "if run loadimage; then " \
|
|
- "run mmcloados;" \
|
|
- "fi;" \
|
|
+ "if run loadbootscript; then " \
|
|
+ "run bootscript;" \
|
|
+ "else " \
|
|
+ "if run loadbootenv; then " \
|
|
+ "echo Loaded environment from ${bootenv};" \
|
|
+ "run importbootenv;" \
|
|
+ "fi;" \
|
|
+ "if test -n $uenvcmd; then " \
|
|
+ "echo Running uenvcmd ...;" \
|
|
+ "run uenvcmd;" \
|
|
+ "fi;" \
|
|
+ "if run loadimage; then " \
|
|
+ "run mmcloados;" \
|
|
+ "fi;" \
|
|
+ "fi ;" \
|
|
"fi;\0" \
|
|
"spiboot=echo Booting from spi ...; " \
|
|
"run spiargs; " \
|