diff options
Diffstat (limited to 'include/configs/omap4_common.h')
| -rw-r--r-- | include/configs/omap4_common.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h index 7e23110cb..7b0c2e3ee 100644 --- a/include/configs/omap4_common.h +++ b/include/configs/omap4_common.h @@ -155,9 +155,13 @@ "vram=${vram} " \ "root=${mmcroot} " \ "rootfstype=${mmcrootfstype}\0" \ - "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ + "bootscr=boot.scr\0" \ + "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} ${bootscr}\0" \ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ "source ${loadaddr}\0" \ + "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ + "importbootenv=echo Importing environment from mmc ...; " \ + "env import -t $loadaddr $filesize\0" \ "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ "mmcboot=echo Booting from mmc${mmcdev} ...; " \ "run mmcargs; " \ @@ -169,7 +173,15 @@ #define CONFIG_BOOTCOMMAND \ "if mmc rescan ${mmcdev}; then " \ - "if run loadbootscript; then " \ + "if run loadbootenv; then " \ + "echo Loaded environment from ${bootenv};" \ + "run importbootenv;" \ + "if test -n $uenvcmd; then " \ + "echo Running uenvcmd ...;" \ + "run uenvcmd;" \ + "fi;" \ + "elif run loadbootscript; then " \ + "echo Loaded script from ${bootscr};" \ "run bootscript; " \ "else " \ "if run loaduimage; then " \ |