From patchwork Wed Jan 15 10:53:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hector Palacios X-Patchwork-Id: 311087 X-Patchwork-Delegate: panto@antoniou-consulting.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 5A9D42C0081 for ; Wed, 15 Jan 2014 22:01:05 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2A3D74AE4F; Wed, 15 Jan 2014 12:01:04 +0100 (CET) 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 POMbRTubSmsC; Wed, 15 Jan 2014 12:01:03 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7AFE54AE43; Wed, 15 Jan 2014 12:01:01 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 786894ACF7 for ; Wed, 15 Jan 2014 12:00:54 +0100 (CET) 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 LBqpFS-vw0Gj for ; Wed, 15 Jan 2014 12:00:48 +0100 (CET) X-Greylist: delayed 383 seconds by postgrey-1.27 at theia; Wed, 15 Jan 2014 12:00:40 CET X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 BL_NJABL=ERR(-1.5) (only DNSBL check requested) Received: from mail1.bemta8.messagelabs.com (mail1.bemta8.messagelabs.com [216.82.243.205]) by theia.denx.de (Postfix) with ESMTPS id 2FDCC4AD03 for ; Wed, 15 Jan 2014 12:00:40 +0100 (CET) Received: from [216.82.241.132:52857] by server-13.bemta-8.messagelabs.com id 95/4F-04207-7D866D25; Wed, 15 Jan 2014 10:54:15 +0000 X-Env-Sender: Hector.Palacios@digi.com X-Msg-Ref: server-2.tower-45.messagelabs.com!1389783254!37092254!1 X-Originating-IP: [66.77.174.13] X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30310 invoked from network); 15 Jan 2014 10:54:15 -0000 Received: from mail.mx1.digi.com (HELO mcl-sms-ns1.digi.com) (66.77.174.13) by server-2.tower-45.messagelabs.com with RC4-SHA encrypted SMTP; 15 Jan 2014 10:54:15 -0000 Received: from mcl-sms-exch01.digi.com (10.5.8.50) by mail.mx1.digi.com (172.16.1.13) with Microsoft SMTP Server (TLS) id 8.3.342.0; Wed, 15 Jan 2014 04:54:17 -0600 Received: from dor-sms-exch01.digi.com (10.49.8.100) by mcl-sms-exch01.digi.com (10.5.8.50) with Microsoft SMTP Server (TLS) id 8.3.342.0; Wed, 15 Jan 2014 04:54:14 -0600 Received: from log-cln-hecpal3.digi.com (10.101.2.165) by dor-sms-exch01.digi.com (10.49.8.100) with Microsoft SMTP Server id 8.3.342.0; Wed, 15 Jan 2014 11:54:12 +0100 From: Hector Palacios To: Date: Wed, 15 Jan 2014 11:53:56 +0100 Message-ID: <1389783236-8464-2-git-send-email-hector.palacios@digi.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1389783236-8464-1-git-send-email-hector.palacios@digi.com> References: <1389783236-8464-1-git-send-email-hector.palacios@digi.com> MIME-Version: 1.0 Cc: afleming@freescale.com, hector.palacios@digi.com, swarren@nvidia.com Subject: [U-Boot] [PATCH 2/2] env_mmc: default to 0 if CONFIG_SYS_MMC_ENV_DEV not defined 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: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Since function mmc_get_env_devno is __weak and can be overridden by board code, boards do not necessarily need to define CONFIG_SYS_MMC_ENV_DEV. If the constant is not defined, return 0 by default. Signed-off-by: Hector Palacios --- common/env_mmc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/env_mmc.c b/common/env_mmc.c index d569b070e005..bd3bc1d50b15 100644 --- a/common/env_mmc.c +++ b/common/env_mmc.c @@ -63,7 +63,11 @@ __weak int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr) __weak int mmc_get_env_devno(void) { +#ifdef CONFIG_SYS_MMC_ENV_DEV return CONFIG_SYS_MMC_ENV_DEV; +#endif + return 0; +} __weak int mmc_get_env_partno(void) {