aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngus Ainslie <angus.ainslie@linaro.org>2011-08-22 11:38:12 -0600
committerJohn Rigby <john.rigby@linaro.org>2011-11-21 23:29:04 -0700
commit3d343a62b8240100d6ce76b9126ff1e97be1eb5f (patch)
treeff7e63280f99270b25fb91da20eff44801c470a6
parent2f1369b85196463f1fddd85bd6f171742f3672dc (diff)
Add a default env that will use boot.scr from the vfat partition2011.11.2Linaro-u-boot-2011.11
Signed-off-by: Angus Ainslie <angus.ainslie@linaro.org>
-rw-r--r--include/configs/origen.h27
1 files changed, 26 insertions, 1 deletions
diff --git a/include/configs/origen.h b/include/configs/origen.h
index 889d5fc72..b000eb648 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -98,7 +98,32 @@
#define CONFIG_SPL
#define COPY_BL2_FNPTR_ADDR 0x02020030
-#define CONFIG_BOOTCOMMAND "fatload mmc 0 40007000 uImage; bootm 40007000"
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "loadaddr=0x42000000\0" \
+ "console=ttySAC2,115200n8\0" \
+ "mmcdev=0:2\0" \
+ "mmcroot=/dev/mmcblk0p2 rw\0" \
+ "rootwait\0" \
+ "mmcargs=setenv bootargs console=${console} " \
+ "root=${mmcroot}\0" \
+ "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+ "source ${loadaddr}\0" \
+ "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
+ "mmcboot=echo Booting from mmc${mmcdev} ...; " \
+ "run mmcargs; " \
+ "bootm ${loadaddr}\0" \
+
+#define CONFIG_BOOTCOMMAND \
+ "if mmc rescan ${mmcdev}; then " \
+ "if run loadbootscript; then " \
+ "run bootscript; " \
+ "else " \
+ "if run loaduimage; then " \
+ "run mmcboot; " \
+ "fi; " \
+ "fi; " \
+ "fi"
/* Miscellaneous configurable options */
#define CONFIG_SYS_LONGHELP /* undef to save memory */