From patchwork Tue Apr 30 20:05:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 240684 X-Patchwork-Delegate: trini@ti.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 E7C732C00CE for ; Wed, 1 May 2013 06:05:41 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3A1384A28D; Tue, 30 Apr 2013 22:05:39 +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 0N5pGQ4hGtaK; Tue, 30 Apr 2013 22:05:39 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 626664A28E; Tue, 30 Apr 2013 22:05:38 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 779C34A290 for ; Tue, 30 Apr 2013 22:05:36 +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 vq3JNIVAwXQ3 for ; Tue, 30 Apr 2013 22:05:31 +0200 (CEST) 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 mail-ye0-f171.google.com (mail-ye0-f171.google.com [209.85.213.171]) by theia.denx.de (Postfix) with ESMTPS id 73E134A28D for ; Tue, 30 Apr 2013 22:05:23 +0200 (CEST) Received: by mail-ye0-f171.google.com with SMTP id m10so141175yen.30 for ; Tue, 30 Apr 2013 13:05:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer; bh=EqNgf18e+939VqY+kI8H8vD+ewehfAmHhocWW+npxbo=; b=h7vht+5mYBllAwHA2FjQrn2nQstCyNprXnZ1DqUTyEIe7rLJ6ndGFGNgon+a6SQT5B 2gOwme43E+l+oDbk0MwkN4wo20NAAkLIa4ThxitDbPbsyxp2AMs2pjqYXUag2QbSpqNj Nchv2EtZnZq/mkOQqr2ThQS0g1lllYDcY0TLdxEWNyi9VgeJzF8jxbQ3fw21plMDGSrF VKATQfQaGQ/vl21i2A0Aw23G1y4GIzsBzl9Y8O6oUB/+g0mm7kRSbHFGockrUSIItgdV WBUSGSjQsYMVegKNPPsDVK8NJouByyx82i0zL0HwfZSd2YkBzSBMzXlyx+ERRLGT3Ell iGdQ== X-Received: by 10.236.146.137 with SMTP id r9mr6090461yhj.42.1367352321486; Tue, 30 Apr 2013 13:05:21 -0700 (PDT) Received: from localhost.localdomain (cpe-065-184-250-089.ec.res.rr.com. [65.184.250.89]) by mx.google.com with ESMTPSA id e64sm39258242yhm.4.2013.04.30.13.05.19 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Apr 2013 13:05:20 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Tue, 30 Apr 2013 16:05:17 -0400 Message-Id: <1367352318-11708-1-git-send-email-trini@ti.com> X-Mailer: git-send-email 1.7.9.5 Cc: Fabio Estevam Subject: [U-Boot] [PATCH 1/2] mx28evk: Guard NAND-related ENV defines with CONFIG_ENV_IS_IN_NAND 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 The redundancy related defines are only correct for NAND, so guard all of that area with CONFIG_ENV_IS_IN_NAND Cc: Fabio Estevam Signed-off-by: Tom Rini --- include/configs/mx28evk.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index d470b47..3747955 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -138,14 +138,14 @@ #define CONFIG_SYS_NAND_5_ADDR_CYCLE /* Environment is in NAND */ +#ifdef CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_RANGE (512 * 1024) -#ifndef CONFIG_ENV_OFFSET #define CONFIG_ENV_OFFSET 0x300000 -#endif #define CONFIG_ENV_OFFSET_REDUND \ (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) +#endif #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS