12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667 |
- diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
- index cd9c567..e75e711 100644
- --- a/tools/env/fw_env.h
- +++ b/tools/env/fw_env.h
- @@ -35,16 +35,60 @@
- #endif
-
- #ifndef CONFIG_BOOTDELAY
- -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
- +#define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */
- #endif
-
- -#ifndef CONFIG_BOOTCOMMAND
- +/*#ifndef CONFIG_BOOTCOMMAND
- #define CONFIG_BOOTCOMMAND \
- "bootp; " \
- "setenv bootargs root=/dev/nfs nfsroot=${serverip}:${rootpath} " \
- "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \
- "bootm"
- #endif
- +*/
- +
- +#ifndef CONFIG_EXTRA_ENV_SETTINGS
- +#define CONFIG_EXTRA_ENV_SETTINGS \
- + "ramboot=fatload mmc 0 0x80200000 uImage; " \
- + "fatload mmc 0 0x80F00000 Display001.dtb; " \
- + "fdt addr 0x80F00000; " \
- + "fatload mmc 0 0x81000000 initrd.gz; " \
- + "setenv initrdsize 0x${filesize}; " \
- + "setenv bootargs console=ttyO0,115200 initrd=0x81000000,${initrdsize} " \
- + "root=/dev/ram0 rw init=/sbin/init debug initcall_debug earlyprintk; " \
- + "bootm 0x80200000 - 0x80F00000\0" \
- + "sdboot=fatload mmc 0 0x80200000 uImage; " \
- + "fatload mmc 0 0x80F00000 Display001.dtb; " \
- + "fdt addr 0x80F00000; " \
- + "setenv bootargs console=ttyO0,115200 " \
- + "root=/dev/mmcblk0p2 rw rootwait vram=50M cma=50M; " \
- + "bootm 0x80200000 - 0x80F00000\0" \
- + "emmcboot=fatload mmc 1 0x80200000 uImage; " \
- + "fatload mmc 1 0x80F00000 Display001.dtb; " \
- + "fdt addr 0x80F00000; " \
- + "setenv bootargs console=ttyO0,115200 " \
- + "root=/dev/mmcblk1p2 rw rootwait vram=50M cma=50M; " \
- + "bootm 0x80200000 - 0x80F00000\0" \
- + "bootcmd=mw.l 0x80020000 0x0040033c; " \
- + "if cmp 0x80020000 0x44e10040 1; " \
- + "then " \
- + "echo ---emmc--; " \
- + "mmc rescan; " \
- + "if fatload mmc 0:1 0x80200000 MLO; then " \
- + "run sdboot; " \
- + "else " \
- + "run emmcboot; " \
- + "fi; " \
- + "else echo --sd--; " \
- + "mmc rescan; " \
- + "if fatload mmc 0:1 0x80200000 MLO; then " \
- + "run sdboot; " \
- + "else " \
- + "run emmcboot; " \
- + "fi; " \
- + "fi;\0"
- +#endif
- +
-
- struct env_opts {
- #ifdef CONFIG_FILE
|