From patchwork Mon Oct 24 09:12:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 121301 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 83676B6F89 for ; Mon, 24 Oct 2011 20:12:25 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 96EF528BAA; Mon, 24 Oct 2011 11:12:23 +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 Nj7AnsrxufMj; Mon, 24 Oct 2011 11:12:23 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9A0A8288C5; Mon, 24 Oct 2011 11:12:20 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 05762288C5 for ; Mon, 24 Oct 2011 11:12:19 +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 gAusHrI2TP6S for ; Mon, 24 Oct 2011 11:12:18 +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-bw0-f44.google.com (mail-bw0-f44.google.com [209.85.214.44]) by theia.denx.de (Postfix) with ESMTPS id 53FE828896 for ; Mon, 24 Oct 2011 11:12:16 +0200 (CEST) Received: by bkas6 with SMTP id s6so7278810bka.3 for ; Mon, 24 Oct 2011 02:12:16 -0700 (PDT) Received: by 10.204.154.209 with SMTP id p17mr16702232bkw.20.1319447536397; Mon, 24 Oct 2011 02:12:16 -0700 (PDT) Received: from localhost.localdomain ([85.13.70.252]) by mx.google.com with ESMTPS id z9sm22882775bkn.7.2011.10.24.02.12.15 (version=SSLv3 cipher=OTHER); Mon, 24 Oct 2011 02:12:15 -0700 (PDT) From: Marek Vasut To: u-boot@lists.denx.de Date: Mon, 24 Oct 2011 11:12:01 +0200 Message-Id: <1319447521-6020-1-git-send-email-marek.vasut@gmail.com> X-Mailer: git-send-email 1.7.6.3 Subject: [U-Boot] [PATCH] Fix compile issue in arch/arm/lib/board.c 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 The commit dc8bbea0170eb2aca428ea221c91fc2e5e11f199 breaks the build of U-Boot if CONFIG_CMD_NET is enabled. arm: Use getenv_ulong() in place of getenv(), strtoul This changes the board code to use the new getenv_ulong() function. Signed-off-by: Marek Vasut Cc: Simon Glass Cc: Wolfgang Denk Cc: Albert ARIBAUD --- arch/arm/lib/board.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index c764844..558e973 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -566,7 +566,7 @@ void board_init_r(gd_t *id, ulong dest_addr) /* Initialize from environment */ load_addr = getenv_ulong("loadaddr", 16, load_addr); #if defined(CONFIG_CMD_NET) - s = getenv("bootfile"); + char *s = getenv("bootfile"); if (s != NULL) copy_filename(BootFile, s, sizeof(BootFile)); #endif