From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 3/6] am335x_evm: Only set CONFIG_NAND when !CONFIG_SPI_BOOT
Date: Wed, 8 May 2013 18:45:54 -0400 [thread overview]
Message-ID: <1368053157-28317-3-git-send-email-trini@ti.com> (raw)
In-Reply-To: <1368053157-28317-1-git-send-email-trini@ti.com>
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 <trini@ti.com>
---
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 */
--
1.7.9.5
next prev parent reply other threads:[~2013-05-08 22:45 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-08 22:45 [U-Boot] [PATCH 1/6] am335x_evm: Drop useless CONFIG_ENV_IS_NOWHERE Tom Rini
2013-05-08 22:45 ` [U-Boot] [PATCH 2/6] am335x_evm: Add MTDPARTS info for SPI flash Tom Rini
2013-05-12 21:10 ` Peter Korsgaard
2013-05-13 12:24 ` Tom Rini
2013-05-13 16:10 ` Tom Rini
2013-05-08 22:45 ` Tom Rini [this message]
2013-05-12 21:08 ` [U-Boot] [PATCH 3/6] am335x_evm: Only set CONFIG_NAND when !CONFIG_SPI_BOOT Peter Korsgaard
2013-05-13 12:21 ` Tom Rini
2013-05-08 22:45 ` [U-Boot] [PATCH 4/6] am335x_evm: Rework board_is_foo() checks Tom Rini
2013-05-08 22:45 ` [U-Boot] [PATCH 5/6] am335x_evm:Add support for the NOR module on the memory cape Tom Rini
2013-05-12 21:19 ` Peter Korsgaard
2013-05-13 13:31 ` Tom Rini
2013-05-08 22:45 ` [U-Boot] [PATCH 6/6] am335x_evm: Add support to boot from NOR Tom Rini
2013-05-12 21:34 ` Peter Korsgaard
2013-05-12 21:42 ` Tom Rini
2013-05-12 21:53 ` Peter Korsgaard
2013-05-13 13:35 ` Tom Rini
2013-05-12 20:54 ` [U-Boot] [PATCH 1/6] am335x_evm: Drop useless CONFIG_ENV_IS_NOWHERE Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1368053157-28317-3-git-send-email-trini@ti.com \
--to=trini@ti.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.