[U-Boot] [PATCH 1/4] tegra2: Avoid warnings if CONFIG_SYS_TEXT_BASE is redefined.

Thierry Reding thierry.reding at avionic-design.de
Mon Nov 14 14:21:33 CET 2011


If a board configuration file redefines CONFIG_SYS_TEXT_BASE, the U-Boot
build system will usually define it explicitly on the compiler command-
line, which will cause the define in tegra2-common.h to emit a
redefinition warning.

To allow boards to redefine CONFIG_SYS_TEXT_BASE, tegra2-common.h now
only defines CONFIG_SYS_TEXT_BASE when it isn't already defined by the
board configuration or the command-line respectively.

Signed-off-by: Thierry Reding <thierry.reding at avionic-design.de>
---
 include/configs/tegra2-common.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h
index 9c3b9fa..76ffd2e 100644
--- a/include/configs/tegra2-common.h
+++ b/include/configs/tegra2-common.h
@@ -153,7 +153,9 @@
 #define PHYS_SDRAM_1		TEGRA2_SDRC_CS0
 #define PHYS_SDRAM_1_SIZE	0x20000000	/* 512M */
 
+#ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE	0x00E08000
+#endif
 #define CONFIG_SYS_SDRAM_BASE	PHYS_SDRAM_1
 
 #define CONFIG_SYS_INIT_RAM_ADDR	CONFIG_STACKBASE
-- 
1.7.7.3



More information about the U-Boot mailing list