60 lines
1.8 KiB
Diff
60 lines
1.8 KiB
Diff
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
|
|
index a989721..4583a5a 100644
|
|
--- a/include/configs/omap4_common.h
|
|
+++ b/include/configs/omap4_common.h
|
|
@@ -150,32 +150,51 @@
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"loadaddr=0x82000000\0" \
|
|
+ "rdaddr=0x81000000\0" \
|
|
"console=ttyO2,115200n8\0" \
|
|
"usbtty=cdc_acm\0" \
|
|
"vram=16M\0" \
|
|
+ "optargs=\0" \
|
|
"mmcdev=0\0" \
|
|
"mmcroot=/dev/mmcblk0p2 rw\0" \
|
|
"mmcrootfstype=ext3 rootwait\0" \
|
|
"mmcargs=setenv bootargs console=${console} " \
|
|
+ "${optargs} " \
|
|
"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" \
|
|
- "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
|
|
+ "bootenv=uEnv.txt\0" \
|
|
+ "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
|
|
+ "importbootenv=echo Importing environment from mmc ...; " \
|
|
+ "env import -t ${loadaddr} ${filesize}\0" \
|
|
+ "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \
|
|
+ "loaduinitrd=ext2load mmc ${mmcdev}:2 ${rdaddr} /boot/uInitrd\0" \
|
|
"mmcboot=echo Booting from mmc${mmcdev} ...; " \
|
|
"run mmcargs; " \
|
|
"bootm ${loadaddr}\0" \
|
|
+ "mmcbootrd=echo Booting from mmc${mmcdev} (+initrd)...; " \
|
|
+ "run mmcargs; " \
|
|
+ "bootm ${loadaddr} ${rdaddr}\0" \
|
|
|
|
#define CONFIG_BOOTCOMMAND \
|
|
"if mmc rescan ${mmcdev}; then " \
|
|
+ "if run loadbootenv; then " \
|
|
+ "echo Loaded environment from ${bootenv};" \
|
|
+ "run importbootenv;" \
|
|
+ "fi;" \
|
|
"if run loadbootscript; then " \
|
|
"run bootscript; " \
|
|
"else " \
|
|
"if run loaduimage; then " \
|
|
- "run mmcboot; " \
|
|
- "fi; " \
|
|
+ "if run loaduinitrd; then " \
|
|
+ "run mmcbootrd;" \
|
|
+ "else " \
|
|
+ "run mmcboot;" \
|
|
+ "fi;" \
|
|
+ "fi;" \
|
|
"fi; " \
|
|
"fi"
|
|
|