From patchwork Thu Jul 11 08:29:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 258330 X-Patchwork-Delegate: scottwood@freescale.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 96DD42C02F8 for ; Thu, 11 Jul 2013 18:30:52 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 35BDB4A1C5; Thu, 11 Jul 2013 10:30:51 +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 C3AsZP2ddy2S; Thu, 11 Jul 2013 10:30:51 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DF12B4A1B6; Thu, 11 Jul 2013 10:30:46 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5C5A54A1B6 for ; Thu, 11 Jul 2013 10:30:40 +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 1lBbELGZ7Tcd for ; Thu, 11 Jul 2013 10:30:36 +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 smtp.mei.co.jp (smtp.mei.co.jp [133.183.100.20]) by theia.denx.de (Postfix) with ESMTP id 57B8C4A1B3 for ; Thu, 11 Jul 2013 10:30:28 +0200 (CEST) Received: from mail-gw.jp.panasonic.com ([157.8.1.157]) by smtp.mei.co.jp (8.12.11.20060614/3.7W/kc-maile11) with ESMTP id r6B8U13m029251 for ; Thu, 11 Jul 2013 17:30:01 +0900 (JST) Received: from epochmail.jp.panasonic.com ([157.8.1.130]) by mail.jp.panasonic.com (8.11.6p2/3.7W/kc-maili17) with ESMTP id r6B8U2300998 for ; Thu, 11 Jul 2013 17:30:02 +0900 Received: by epochmail.jp.panasonic.com (8.12.11.20060308/3.7W/lomi14) id r6B8U27f011789; Thu, 11 Jul 2013 17:30:02 +0900 Received: from poodle by lomi14.jp.panasonic.com (8.12.11.20060308/3.7W) with ESMTP id r6B8U14G011747; Thu, 11 Jul 2013 17:30:01 +0900 Received: from beagle.diag.org (beagle.diag.org [10.186.51.83]) by poodle (Postfix) with ESMTP id CA7322740045; Thu, 11 Jul 2013 17:30:01 +0900 (JST) From: Masahiro Yamada To: u-boot@lists.denx.de Date: Thu, 11 Jul 2013 17:29:57 +0900 Message-Id: <1373531397-32060-1-git-send-email-yamada.m@jp.panasonic.com> X-Mailer: git-send-email 1.8.1.2 Subject: [U-Boot] [PATCH] cmd_nand: Do not show usage when scrub is aborted X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 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 When executing nand scrub, the user gets the prompt: Really scrub this NAND flash? We do not want the annoying usage displayed when saying N here. Signed-off-by: Masahiro Yamada --- common/cmd_nand.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cmd_nand.c b/common/cmd_nand.c index adc1ce4..04ab0f1 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -616,11 +616,11 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) opts.scrub = 1; else { puts("scrub aborted\n"); - return -1; + return 1; } } else { puts("scrub aborted\n"); - return -1; + return 1; } } ret = nand_erase_opts(nand, &opts);