From patchwork Wed Jan 27 14:56:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Samuel Egli X-Patchwork-Id: 574054 X-Patchwork-Delegate: andreas.biessmann@googlemail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 48873140BF6 for ; Thu, 28 Jan 2016 02:02:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2B10FA759A; Wed, 27 Jan 2016 16:02:35 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lCi77OOU8VAM; Wed, 27 Jan 2016 16:02:34 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 82B60A752C; Wed, 27 Jan 2016 16:02:34 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 92F83A752C for ; Wed, 27 Jan 2016 16:02:31 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yTSHTJiu3tMx for ; Wed, 27 Jan 2016 16:02:31 +0100 (CET) X-Greylist: delayed 366 seconds by postgrey-1.34 at theia; Wed, 27 Jan 2016 16:02:26 CET X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from david.siemens.de (david.siemens.de [192.35.17.14]) by theia.denx.de (Postfix) with ESMTPS id 5DAB1A7498 for ; Wed, 27 Jan 2016 16:02:26 +0100 (CET) Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id u0REuJoe000543 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 27 Jan 2016 15:56:19 +0100 Received: from dev.sbt.siemens.com (MD1F3VSC.ww002.siemens.net [139.16.77.253]) by mail2.siemens.de (8.15.1/8.15.1) with ESMTP id u0REuIxX008567; Wed, 27 Jan 2016 15:56:18 +0100 From: Samuel Egli To: u-boot@lists.denx.de Date: Wed, 27 Jan 2016 15:56:07 +0100 Message-Id: <1453906567-4652-1-git-send-email-samuel.egli@siemens.com> X-Mailer: git-send-email 2.1.4 Cc: Matthias Michel , Roger Meier Subject: [U-Boot] [PATCH] siemens,at91: enable features for smartweb X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Matthias Michel New features for smartweb: * switch to hush command parser * change autoboot stop to * allow to write ethaddr Signed-off-by: Matthias Michel Reviewed-by: Samuel Egli Cc: Roger Meier Cc: Heiko Schocher Reviewed-by: Heiko Schocher Reviewed-by: Andreas Bießmann --- 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 \"\" 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