Message ID | 1453906567-4652-1-git-send-email-samuel.egli@siemens.com |
---|---|
State | Accepted |
Commit | b96fd8250160946e4371ba8d7075c8c5511b37a0 |
Delegated to: | Andreas Bießmann |
Headers | show |
Hello Samuel, Am 27.01.2016 um 15:56 schrieb Samuel Egli: > From: Matthias Michel <matthias.michel@siemens.com> > > New features for smartweb: > * switch to hush command parser > * change autoboot stop to <ESC><ESC> > * allow to write ethaddr > > Signed-off-by: Matthias Michel <matthias.michel@siemens.com> > Reviewed-by: Samuel Egli <samuel.egli@siemens.com> > Cc: Roger Meier <r.meier@siemens.com> > Cc: Heiko Schocher <hs@denx.de> > --- > configs/smartweb_defconfig | 5 ++++- > include/configs/smartweb.h | 14 ++++++++++---- > 2 files changed, 14 insertions(+), 5 deletions(-) Reviewed-by: Heiko Schocher <hs@denx.de> bye, Heiko > > diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig > index ee4340f..654bb4b 100644 > --- a/configs/smartweb_defconfig > +++ b/configs/smartweb_defconfig > @@ -3,4 +3,7 @@ CONFIG_ARCH_AT91=y > CONFIG_TARGET_SMARTWEB=y > CONFIG_SPL=y > CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260" > -CONFIG_SYS_PROMPT="U-Boot> " > +CONFIG_SYS_PROMPT="U-Boot# " > +CONFIG_AUTOBOOT_KEYED=y > +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n" > +CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" > diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h > index 44d1d5a..de7b6bc 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 >
On Wed, Jan 27, 2016 at 03:56:07PM +0100, Egli, Samuel wrote: > From: Matthias Michel <matthias.michel@siemens.com> > > New features for smartweb: > * switch to hush command parser > * change autoboot stop to <ESC><ESC> > * allow to write ethaddr > > Signed-off-by: Matthias Michel <matthias.michel@siemens.com> > Reviewed-by: Samuel Egli <samuel.egli@siemens.com> > Cc: Roger Meier <r.meier@siemens.com> > Cc: Heiko Schocher <hs@denx.de> > Reviewed-by: Heiko Schocher <hs@denx.de> Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com> > --- > configs/smartweb_defconfig | 5 ++++- > include/configs/smartweb.h | 14 ++++++++++---- > 2 files changed, 14 insertions(+), 5 deletions(-) > > diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig > index ee4340f..654bb4b 100644 > --- a/configs/smartweb_defconfig > +++ b/configs/smartweb_defconfig > @@ -3,4 +3,7 @@ CONFIG_ARCH_AT91=y > CONFIG_TARGET_SMARTWEB=y > CONFIG_SPL=y > CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260" > -CONFIG_SYS_PROMPT="U-Boot> " > +CONFIG_SYS_PROMPT="U-Boot# " > +CONFIG_AUTOBOOT_KEYED=y > +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n" > +CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" > diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h > index 44d1d5a..de7b6bc 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
diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index ee4340f..654bb4b 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -3,4 +3,7 @@ CONFIG_ARCH_AT91=y CONFIG_TARGET_SMARTWEB=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260" -CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_SYS_PROMPT="U-Boot# " +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n" +CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 44d1d5a..de7b6bc 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