From patchwork Sun Oct 23 21:51:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Denk X-Patchwork-Id: 121252 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 0EE3DB6F70 for ; Mon, 24 Oct 2011 08:51:22 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3480D286EA; Sun, 23 Oct 2011 23:51:20 +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 3AMUWUBKrayt; Sun, 23 Oct 2011 23:51:20 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7906828701; Sun, 23 Oct 2011 23:51:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D485428701 for ; Sun, 23 Oct 2011 23:51:16 +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 13AgpYt9y7qq for ; Sun, 23 Oct 2011 23:51:16 +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 mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by theia.denx.de (Postfix) with ESMTP id 4CFE3286EA for ; Sun, 23 Oct 2011 23:51:14 +0200 (CEST) Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 96F401C1D9F1 for ; Sun, 23 Oct 2011 23:51:14 +0200 (CEST) X-Auth-Info: /rSA7R+D655+0XcaoV/n6qh7czLZ9XEIzAI+thzGLt0= Received: from diddl.denx.de (host-80-81-18-216.customer.m-online.net [80.81.18.216]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 90AD91C0008F for ; Sun, 23 Oct 2011 23:51:14 +0200 (CEST) Received: from gemini.denx.de (unknown [10.0.0.2]) by diddl.denx.de (Postfix) with ESMTP id 7586EC913106 for ; Sun, 23 Oct 2011 23:51:14 +0200 (CEST) Received: by gemini.denx.de (Postfix, from userid 500) id 67FC51408771; Sun, 23 Oct 2011 23:51:14 +0200 (CEST) From: Wolfgang Denk To: u-boot@lists.denx.de Date: Sun, 23 Oct 2011 23:51:11 +0200 Message-Id: <1319406671-6360-1-git-send-email-wd@denx.de> X-Mailer: git-send-email 1.7.6.2 In-Reply-To: <1318552994-6653-3-git-send-email-sjg@chromium.org> References: <1318552994-6653-3-git-send-email-sjg@chromium.org> Subject: [U-Boot] [PATCH] arch/arm/lib/board.c: fix build error 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 Commit dc8bbea "arm: Use getenv_ulong() in place of getenv(), strtoul" introduced a build error for all ARM boards with network support: board.c: In function 'board_init_r': board.c:569: error: 's' undeclared (first use in this function) board.c:569: error: (Each undeclared identifier is reported only once board.c:569: error: for each function it appears in.) Fix it. Signed-off-by: Wolfgang Denk Acked-by: Heiko Schocher --- arch/arm/lib/board.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index c764844..367cf6b 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -441,6 +441,9 @@ void board_init_r(gd_t *id, ulong dest_addr) #if !defined(CONFIG_SYS_NO_FLASH) ulong flash_size; #endif +#if defined(CONFIG_CMD_NET) + char *s; +#endif gd = id;