Copy Linaro for comments, as Linaro may be concerned by this patch.
On Mon, Oct 25, 2010 at 11:20 PM, Shawn Guo <shawn....@gmail.com> wrote:
> This patch is to consolidate default mx51evk env for two primary
> boot modes, mmcboot and netboot.
>
> It also cleans some unused env like netdev, uboot and redundant
> env like loadaddr since CONFIG_LOADADDR already defines it.
>
> Signed-off-by: Shawn Guo <shawn....@gmail.com>
> ---
> include/configs/mx51evk.h | 50 ++++++++++++++++++++++++++++++++++----------
> 1 files changed, 38 insertions(+), 12 deletions(-)
>
> diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
> index 6165473..186cd8c 100644
> --- a/include/configs/mx51evk.h
> +++ b/include/configs/mx51evk.h
> @@ -126,18 +126,42 @@
>
> #define CONFIG_LOADADDR 0x90800000 /* loadaddr env var */
>
> -#define CONFIG_EXTRA_ENV_SETTINGS
> \
> - "netdev=eth0\0" \
> - "uboot_addr=0xa0000000\0" \
> - "uboot=u-boot.bin\0" \
> - "loadaddr=0x90800000\0" \
> - "bootargs_base=setenv bootargs console=tty "\
> - "console=ttymxc0,${baudrate}\0"\
> - "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\
> - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\
> - "bootcmd=run bootcmd_net\0" \
> - "bootcmd_net=run bootargs_base bootargs_nfs; " \
> - "tftpboot ${loadaddr} ${kernel}; bootm\0"
> +#define CONFIG_EXTRA_ENV_SETTINGS \
> + "script=boot.scr\0" \
> + "uimage=uImage\0" \
> + "mmcdev=0\0" \
> + "mmcpart=2\0" \
> + "mmcroot=/dev/mmcblk0p3 rw\0" \
> + "mmcrootfstype=ext3 rootwait\0" \
> + "mmcargs=setenv bootargs console=ttymxc0,${baudrate} " \
> + "root=${mmcroot} " \
> + "rootfstype=${mmcrootfstype}\0" \
> + "loadbootscript=" \
> + "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
> + "bootscript=echo Running bootscript from mmc ...; " \
> + "source\0" \
> + "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0"
> \
> + "mmcboot=echo Booting from mmc ...; " \
> + "run mmcargs; " \
> + "bootm\0" \
> + "netargs=setenv bootargs console=ttymxc0,${baudrate} " \
> + "root=/dev/nfs " \
> + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
> + "netboot=echo Booting from net ...; " \
> + "run netargs; " \
> + "dhcp ${uimage}; bootm\0" \
> +
> +#define CONFIG_BOOTCOMMAND \
> + "if mmc rescan ${mmcdev}; then " \
> + "if run loadbootscript; then " \
> + "run bootscript; " \
> + "else " \
> + "if run loaduimage; then " \
> + "run mmcboot; " \
> + "else run netboot; " \
> + "fi; " \
> + "fi; " \
> + "else run netboot; fi"
>
> #define CONFIG_ARP_TIMEOUT 200UL
>
> @@ -145,6 +169,8 @@
> * Miscellaneous configurable options
> */
> #define CONFIG_SYS_LONGHELP /* undef to save memory */
> +#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
> +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
> #define CONFIG_SYS_PROMPT "MX51EVK U-Boot > "
> #define CONFIG_AUTO_COMPLETE
> #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
> --
> 1.7.1
>
>
--
Regards,
Shawn
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
