From patchwork Mon Jun 6 18:56:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Hobbs X-Patchwork-Id: 98998 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 E1541B6F91 for ; Tue, 7 Jun 2011 04:57:43 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8EDE02816A; Mon, 6 Jun 2011 20:57:21 +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 kzE2jZWTLOtY; Mon, 6 Jun 2011 20:57:21 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A64B92818A; Mon, 6 Jun 2011 20:57:16 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C2D3B2819A for ; Mon, 6 Jun 2011 20:57:14 +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 zO5AGDyBZXOP for ; Mon, 6 Jun 2011 20:57:14 +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 smtp165.dfw.emailsrvr.com (smtp165.dfw.emailsrvr.com [67.192.241.165]) by theia.denx.de (Postfix) with ESMTPS id 01FD92818F for ; Mon, 6 Jun 2011 20:57:10 +0200 (CEST) Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp16.relay.dfw1a.emailsrvr.com (SMTP Server) with ESMTP id 9B2C54052F; Mon, 6 Jun 2011 14:57:09 -0400 (EDT) X-Virus-Scanned: OK Received: by smtp16.relay.dfw1a.emailsrvr.com (Authenticated sender: jason.hobbs-AT-calxeda.com) with ESMTPSA id 4AAFB4048C; Mon, 6 Jun 2011 14:57:06 -0400 (EDT) Received: by jhobbs-laptop (sSMTP sendmail emulation); Mon, 06 Jun 2011 13:57:00 -0500 From: "Jason Hobbs" To: u-boot@lists.denx.de Date: Mon, 6 Jun 2011 13:56:37 -0500 Message-Id: <1307386599-4256-3-git-send-email-jason.hobbs@calxeda.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1307386599-4256-1-git-send-email-jason.hobbs@calxeda.com> References: <1307386599-4256-1-git-send-email-jason.hobbs@calxeda.com> Cc: Jason Hobbs , Rob Herring Subject: [U-Boot] [PATCH 2/4] common: make abortboot available for pxecfg use 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 From: Rob Herring Signed-off-by: Jason Hobbs --- common/main.c | 7 +++++++ include/common.h | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/common/main.c b/common/main.c index 7da6604..4185bfd 100644 --- a/common/main.c +++ b/common/main.c @@ -263,6 +263,13 @@ static __inline__ int abortboot(int bootdelay) # endif /* CONFIG_AUTOBOOT_KEYED */ #endif /* CONFIG_BOOTDELAY >= 0 */ +int _abortboot(int bootdelay) +{ +#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0) + return abortboot(bootdelay); +#endif +} + /****************************************************************************/ void main_loop (void) diff --git a/include/common.h b/include/common.h index e659630..fd389e7 100644 --- a/include/common.h +++ b/include/common.h @@ -234,6 +234,7 @@ int readline_into_buffer (const char *const prompt, char * buffer); int parse_line (char *, char *[]); void init_cmd_timeout(void); void reset_cmd_timeout(void); +int _abortboot(int bootdelay); /* arch/$(ARCH)/lib/board.c */ void board_init_f (ulong) __attribute__ ((noreturn));