From: Sanjeev Premi <premi@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 6/6] omap3evm: fix errors caused by multiple definitions
Date: Fri, 30 Sep 2011 16:49:01 +0530 [thread overview]
Message-ID: <1317381541-2137-7-git-send-email-premi@ti.com> (raw)
In-Reply-To: <1317381541-2137-1-git-send-email-premi@ti.com>
Fix these errors when building with recently added
omap3_evm_quick_nand_config:
env_nowhere.o: In function `env_relocate_spec':
/home/premi/u-boot/common/env_nowhere.c:40: multiple definition
of `env_relocate_spec'
env_nand.o:/home/premi/u-boot/common/env_nand.c:416: first defi
ned here
env_nowhere.o: In function `env_get_char_spec':
/home/premi/u-boot/common/env_nowhere.c:44: multiple definition
of `env_get_char_spec'
env_nand.o:/home/premi/u-boot/common/env_nand.c:77: first defin
ed here
env_nowhere.o: In function `env_init':
/home/premi/u-boot/common/env_nowhere.c:54: multiple definition
of `env_init'
env_nand.o:/home/premi/u-boot/common/env_nand.c:144: first defi
ned here
env_nowhere.o: In function `env_relocate_spec':
/home/premi/u-boot/common/env_nowhere.c:40: multiple definition
of `env_ptr'
env_nand.o:/home/premi/u-boot/common/env_nand.c:77: first defin
ed here
Signed-off-by: Sanjeev Premi <premi@ti.com>
---
include/configs/omap3_evm_common.h | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
index baa74bf..7a5f602 100644
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@@ -239,15 +239,20 @@
#define CONFIG_NAND_OMAP_GPMC
#define GPMC_NAND_ECC_LP_x16_LAYOUT
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
#elif defined(CONFIG_CMD_ONENAND)
#define CONFIG_SYS_FLASH_BASE PISMO1_ONEN_BASE
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
+#endif
+#if !defined(CONFIG_ENV_IS_NOWHERE)
+#if defined(CONFIG_CMD_NAND)
+#define CONFIG_ENV_IS_IN_NAND
+#elif defined(CONFIG_CMD_ONENAND)
#define CONFIG_ENV_IS_IN_ONENAND
#define CONFIG_ENV_OFFSET ONENAND_ENV_OFFSET
#endif
+#endif /* CONFIG_ENV_IS_NOWHERE */
#define CONFIG_ENV_ADDR CONFIG_ENV_OFFSET
--
1.7.0.4
next prev parent reply other threads:[~2011-09-30 11:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-30 11:18 [U-Boot] [PATCH 0/6] omap3evm: Clean-up and add new configurations Sanjeev Premi
2011-09-30 11:18 ` [U-Boot] [PATCH 1/6] omap3evm: Reorder related config options Sanjeev Premi
2011-09-30 11:18 ` [U-Boot] [PATCH 2/6] omap3evm: Prepare to split configuration Sanjeev Premi
2011-09-30 11:18 ` [U-Boot] [PATCH 3/6] omap3evm: move common config options to new file Sanjeev Premi
2011-09-30 11:18 ` [U-Boot] [PATCH 4/6] omap3evm: Add (quick) configuration for MMC/SD only Sanjeev Premi
2011-09-30 11:19 ` [U-Boot] [PATCH 5/6] omap3evm: Add (quick) configuration for NAND only Sanjeev Premi
2011-09-30 11:19 ` Sanjeev Premi [this message]
2011-10-18 20:25 ` [U-Boot] [PATCH 0/6] omap3evm: Clean-up and add new configurations Albert ARIBAUD
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=1317381541-2137-7-git-send-email-premi@ti.com \
--to=premi@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox