From patchwork Wed May 8 22:45:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 242655 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 393A52C00F4 for ; Thu, 9 May 2013 08:46:39 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 023594A113; Thu, 9 May 2013 00:46:35 +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 IiAj0+y3vr88; Thu, 9 May 2013 00:46:34 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C324F4A117; Thu, 9 May 2013 00:46:21 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 480E64A096 for ; Thu, 9 May 2013 00:46:17 +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 7HGY1gQlqiKo for ; Thu, 9 May 2013 00:46:11 +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-ye0-f181.google.com (mail-ye0-f181.google.com [209.85.213.181]) by theia.denx.de (Postfix) with ESMTPS id 9D9094A10C for ; Thu, 9 May 2013 00:46:06 +0200 (CEST) Received: by mail-ye0-f181.google.com with SMTP id l8so540803yen.40 for ; Wed, 08 May 2013 15:46:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=Q/erqzWiukR/H46BcgtEjC5S+fAQ7YO853y2nLfwcgg=; b=tEkAMrH+IRkbR1XquzE3UH6oc2qLMMM7C0UPvu8jkXuyDzKynb1pVA5bpPYggueW1w j9pDngQsokfG5VDqtzSkSehn9CrRL0Jmw0WwGVkLcQ25AKuRC7T/bSnaznMjWDbDMhkb H9wG2w0/6ZY8tk/7LiTVbyBB8dbuJXyVQyH/X4Bi6JLUKMcviN1ediTFCbwN4vk3YDj7 PkldBQyuHn7Qw2JF800XvPpO8mAmVFu36j6o6YsGrQ3cjTQMQ8rCliKe/C24hiwarYY5 y8QCVpyRgtI0IsuYHDG9LDJ0J/oVx/FZAQkV+lMan/RV9LTrEcPN1YHhZCCKJOjphvyp Z/Xw== X-Received: by 10.236.47.136 with SMTP id t8mr7975451yhb.64.1368053165225; Wed, 08 May 2013 15:46:05 -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 w12sm826162yhj.19.2013.05.08.15.46.03 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 May 2013 15:46:03 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Wed, 8 May 2013 18:45:54 -0400 Message-Id: <1368053157-28317-3-git-send-email-trini@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1368053157-28317-1-git-send-email-trini@ti.com> References: <1368053157-28317-1-git-send-email-trini@ti.com> Subject: [U-Boot] [PATCH 3/6] am335x_evm: Only set CONFIG_NAND when !CONFIG_SPI_BOOT 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 Due to hardware design, we can't have NAND present (as we know of NAND today) when booting from SPI, so disable NAND then as that simplifies logic. Signed-off-by: Tom Rini --- include/configs/am335x_evm.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 004a06a..90cc1f5 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -230,7 +230,9 @@ /* USB Device Firmware Update support */ #define CONFIG_DFU_FUNCTION #define CONFIG_DFU_MMC +#ifdef CONFIG_NAND #define CONFIG_DFU_NAND +#endif #define CONFIG_CMD_DFU #define DFU_ALT_INFO_MMC \ "boot part 0 1;" \ @@ -335,6 +337,7 @@ #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/am33xx/u-boot-spl.lds" #define CONFIG_SPL_BOARD_INIT +#ifdef CONFIG_NAND #define CONFIG_SPL_NAND_AM33XX_BCH #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE @@ -365,6 +368,7 @@ #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 +#endif /* * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM @@ -466,7 +470,10 @@ #define CONFIG_PHY_ADDR 0 #define CONFIG_PHY_SMSC +#if !defined(CONFIG_SPI_BOOT) #define CONFIG_NAND +#endif + /* NAND support */ #ifdef CONFIG_NAND #define CONFIG_CMD_NAND @@ -484,11 +491,9 @@ /* CS0 */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ -#if !defined(CONFIG_SPI_BOOT) #define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #endif -#endif #endif /* ! __CONFIG_AM335X_EVM_H */