From patchwork Thu Oct 20 19:05:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Moffett X-Patchwork-Id: 120861 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 A442D1007D1 for ; Fri, 21 Oct 2011 06:06:36 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5E00129247; Thu, 20 Oct 2011 21:06:35 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 emVT7bT-IEmN; Thu, 20 Oct 2011 21:06:35 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9F0A229135; Thu, 20 Oct 2011 21:06:32 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AEC0529135 for ; Thu, 20 Oct 2011 21:06:30 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 jsCKUi3mcXDQ for ; Thu, 20 Oct 2011 21:06:28 +0200 (CEST) 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 border.exmeritus.com (unknown [70.167.241.26]) by theia.denx.de (Postfix) with ESMTP id 6B29E28FE2 for ; Thu, 20 Oct 2011 21:06:27 +0200 (CEST) Received: from ysera.exmeritus.com (firewall2.exmeritus.com [10.13.38.2]) by border.exmeritus.com (Postfix) with ESMTP id 16DA9AC07C; Thu, 20 Oct 2011 15:06:25 -0400 (EDT) From: Kyle Moffett To: u-boot@lists.denx.de Date: Thu, 20 Oct 2011 15:05:50 -0400 Message-Id: <1319137550-6503-1-git-send-email-Kyle.D.Moffett@boeing.com> X-Mailer: git-send-email 1.7.2.5 Cc: Kyle Moffett Subject: [U-Boot] [PATCH] Allow the "reset" command to be omitted with CONFIG_CMD_RESET X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This new #define is set by default in config_cmd_defaults.h, and config_cmd_all.h, but this allows boards to conditionally omit the "reset" command if necessary. Signed-off-by: Kyle Moffett --- README | 1 + common/cmd_boot.c | 2 ++ include/config_cmd_all.h | 1 + include/config_cmd_defaults.h | 1 + 4 files changed, 5 insertions(+), 0 deletions(-) diff --git a/README b/README index 7e032a9..98c6192 100644 --- a/README +++ b/README @@ -772,6 +772,7 @@ The following options need to be configured: host CONFIG_CMD_PORTIO * Port I/O CONFIG_CMD_REGINFO * Register dump + CONFIG_CMD_RESET Reset the CPU CONFIG_CMD_RUN run command in env variable CONFIG_CMD_SAVES * save S record dump CONFIG_CMD_SCSI * SCSI Support diff --git a/common/cmd_boot.c b/common/cmd_boot.c index 0afd939..f5779e9 100644 --- a/common/cmd_boot.c +++ b/common/cmd_boot.c @@ -71,8 +71,10 @@ U_BOOT_CMD( #endif +#ifdef CONFIG_CMD_RESET U_BOOT_CMD( reset, 1, 0, do_reset, "Perform RESET of the CPU", "" ); +#endif diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 9716f9c..b972cfa 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -71,6 +71,7 @@ #define CONFIG_CMD_REGINFO /* Register dump */ #define CONFIG_CMD_REISER /* Reiserfs support */ #define CONFIG_CMD_RARP /* rarpboot support */ +#define CONFIG_CMD_RESET /* reset the CPU */ #define CONFIG_CMD_RUN /* run command in env variable */ #define CONFIG_CMD_SAVEENV /* saveenv */ #define CONFIG_CMD_SAVES /* save S record dump */ diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h index a55b268..9877aac 100644 --- a/include/config_cmd_defaults.h +++ b/include/config_cmd_defaults.h @@ -14,5 +14,6 @@ #define CONFIG_CMD_EXPORTENV 1 #define CONFIG_CMD_GO 1 #define CONFIG_CMD_IMPORTENV 1 +#define CONFIG_CMD_RESET 1 #endif