[U-Boot] [PATCH][NEXT] arm-reloc: don't undef CONFIG_SYS_ARM_WITHOUT_RELOC

Ben Gardiner bengardiner at nanometrics.ca
Wed Sep 22 23:32:49 CEST 2010


There were some #undef's of CONFIG_SYS_ARM_WITHOUT_RELOC added to a few board
configs as part of the arm relocation series; but these are not needed now as we
do not #undef what is not #defined in the first place.

Signed-off-by: Ben Gardiner <bengardiner at nanometrics.ca>
CC: Heiko Schocher <hs at denx.de>

---
 include/configs/da850evm.h         |    1 -
 include/configs/imx27lite-common.h |    1 -
 include/configs/omap3_beagle.h     |    1 -
 include/configs/qong.h             |    1 -
 include/configs/tx25.h             |    1 -
 5 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index d02b196..e0a3bae 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -138,7 +138,6 @@
 #endif
 
 /* additions for new relocation code, must added to all boards */
-#undef CONFIG_SYS_ARM_WITHOUT_RELOC /* This board is tested with relocation support */
 #define CONFIG_SYS_SDRAM_BASE		0xc0000000
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \
 					CONFIG_SYS_GBL_DATA_SIZE)
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index 812e5f2..4f7d61d 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -236,7 +236,6 @@
 	"mtdparts=" MTDPARTS_DEFAULT "\0"				\
 
 /* additions for new relocation code, must added to all boards */
-#undef CONFIG_SYS_ARM_WITHOUT_RELOC /* This board is tested with relocation support */
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \
 					CONFIG_SYS_GBL_DATA_SIZE)
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 2463be4..ce658d1 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -341,7 +341,6 @@ extern unsigned int boot_flash_type;
 #endif
 
 /* additions for new relocation code, must added to all boards */
-#undef CONFIG_SYS_ARM_WITHOUT_RELOC /* This board is tested with relocation support */
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_SP_ADDR		(LOW_LEVEL_SRAM_STACK - CONFIG_SYS_GBL_DATA_SIZE)
 
diff --git a/include/configs/qong.h b/include/configs/qong.h
index 7a68b7b..b9144eb 100644
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -283,7 +283,6 @@ extern int qong_nand_rdy(void *chip);
 	"128k(env2),2432k(kernel),13m(ramdisk),-(user)"
 
 /* additions for new relocation code, must added to all boards */
-#undef CONFIG_SYS_ARM_WITHOUT_RELOC /* This board is tested with relocation support */
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
 #define CONFIG_SYS_INIT_RAM_ADDR	IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_END		IRAM_SIZE
diff --git a/include/configs/tx25.h b/include/configs/tx25.h
index c798570..85f166e 100644
--- a/include/configs/tx25.h
+++ b/include/configs/tx25.h
@@ -177,7 +177,6 @@
 	"upd=run load update\0"						\
 
 /* additions for new relocation code, must added to all boards */
-#undef CONFIG_SYS_ARM_WITHOUT_RELOC /* This board is tested with relocation support */
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \
 					CONFIG_SYS_GBL_DATA_SIZE)
-- 
1.7.0.4



More information about the U-Boot mailing list