diff options
| author | Jon Medhurst <jon.medhurst@linaro.org> | 2011-11-23 11:09:34 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-04-23 07:48:45 -0600 |
| commit | 8366422199b71e3998df80d42306e31aef4a13af (patch) | |
| tree | 79761a287f9a2ccb1930694510ed6d2209a184bc | |
| parent | b4673ba4d88466194acc927870a4e959c47bb181 (diff) | |
ARM: vexpress: Extend default boot sequence to load script from MMC
Signed-off-by: Jon Medhurst <jon.medhurst@linaro.org>
| -rw-r--r-- | include/configs/vexpress_common.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 7c1588d27..e81a379a3 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -176,6 +176,8 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_SAVEENV #define CONFIG_CMD_RUN +#define CONFIG_CMD_BOOTD +#define CONFIG_CMD_ECHO #define CONFIG_CMD_FAT #define CONFIG_DOS_PARTITION 1 @@ -224,7 +226,14 @@ #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET /* Basic environment settings */ -#define CONFIG_BOOTCOMMAND "run bootflash;" +#define CONFIG_BOOTCOMMAND \ + "if mmc rescan ${mmcdev}; then " \ + "if run loadbootscript; then " \ + "run bootscript; " \ + "fi; " \ + "fi; " \ + "run bootflash;" + #ifdef CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP #define CONFIG_PLATFORM_ENV_SETTINGS \ "loadaddr=0x80008000\0" \ @@ -256,7 +265,12 @@ "devtmpfs.mount=0 vmalloc=256M\0" \ "bootflash=run flashargs; " \ "cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \ - "bootm ${kernel_addr} ${ramdisk_addr_r}\0" + "bootm ${kernel_addr} ${ramdisk_addr_r}\0" \ + "mmcdev=0\0" \ + "bootscr=boot.scr\0" \ + "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} ${bootscr}\0" \ + "bootscript=echo Running bootscript from mmc ...; " \ + "source ${loadaddr}\0" /* FLASH and environment organization */ #define PHYS_FLASH_SIZE 0x04000000 /* 64MB */ @@ -303,6 +317,8 @@ #define CONFIG_SYS_PROMPT "VExpress# " #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_HUSH_PARSER +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */ #define CONFIG_CMD_SOURCE #define CONFIG_SYS_LONGHELP |