44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
--- u-boot-2013.01/include/configs/omap4_common.h.orig 2013-01-15 15:47:42.000000000 -0600
|
|
+++ u-boot-2013.01/include/configs/omap4_common.h 2013-01-29 13:36:43.664643761 -0600
|
|
@@ -156,9 +156,11 @@
|
|
"vram=${vram} " \
|
|
"root=${mmcroot} " \
|
|
"rootfstype=${mmcrootfstype}\0" \
|
|
- "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
|
|
- "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
|
|
- "source ${loadaddr}\0" \
|
|
+ "bootenv=uEnv.txt\0" \
|
|
+ "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
|
|
+ "importbootenv=echo Importing environment from mmc ...; " \
|
|
+ "env import -t $loadaddr $filesize\0" \
|
|
+ "bootscript=echo Running bootscript from mmc ...; " \
|
|
"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
|
|
"mmcboot=echo Booting from mmc${mmcdev} ...; " \
|
|
"run mmcargs; " \
|
|
@@ -166,13 +168,18 @@
|
|
|
|
#define CONFIG_BOOTCOMMAND \
|
|
"mmc dev ${mmcdev}; if mmc rescan; then " \
|
|
- "if run loadbootscript; then " \
|
|
- "run bootscript; " \
|
|
- "else " \
|
|
- "if run loaduimage; then " \
|
|
- "run mmcboot; " \
|
|
- "fi; " \
|
|
- "fi; " \
|
|
+ "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 loaduimage; then " \
|
|
+ "run mmcboot;" \
|
|
+ "fi;" \
|
|
"fi"
|
|
|
|
#define CONFIG_AUTO_COMPLETE 1
|