diff options
author | Tom Rini <trini@konsulko.com> | 2016-02-20 17:32:48 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-02-20 17:32:48 -0500 |
commit | 20680b560a17fb29c862de77930cfbf76b24f83c (patch) | |
tree | f66975032b21063ad86fd01553983b3c79b398cf /include/configs/smartweb.h | |
parent | db6ce2312dcae87619136457d1f9df56789f630a (diff) | |
parent | 2a0b9ea3067b00366455b0504056cb6728a0b865 (diff) | |
download | blackbird-obmc-uboot-20680b560a17fb29c862de77930cfbf76b24f83c.tar.gz blackbird-obmc-uboot-20680b560a17fb29c862de77930cfbf76b24f83c.zip |
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'include/configs/smartweb.h')
-rw-r--r-- | include/configs/smartweb.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 44d1d5a171..de7b6bca1d 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -49,10 +49,18 @@ #define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f() */ #define CONFIG_DISPLAY_CPUINFO /* display CPU Info at startup */ +/* We set the max number of command args high to avoid HUSH bugs. */ +#define CONFIG_SYS_MAXARGS 32 + /* setting board specific options */ -# define CONFIG_MACH_TYPE MACH_TYPE_SMARTWEB -#define CONFIG_CMDLINE_EDITING +#define CONFIG_MACH_TYPE MACH_TYPE_SMARTWEB +#define CONFIG_AUTO_COMPLETE +#define CONFIG_ENV_OVERWRITE 1 /* Overwrite ethaddr / serial# */ +#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_AUTO_COMPLETE +#define CONFIG_SYS_AUTOLOAD "yes" +#define CONFIG_RESET_TO_RETRY /* The LED PINs */ #define CONFIG_RED_LED AT91_PIN_PA9 @@ -184,9 +192,7 @@ /* General Boot Parameter */ #define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTCOMMAND "run flashboot" -#define CONFIG_BOOT_RETRY_TIME 30 #define CONFIG_SYS_CBSIZE 512 -#define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE \ (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_LONGHELP |