ARM: relocation: don't undef CONFIG_SYS_ARM_WITHOUT_RELOC

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@nanometrics.ca>
CC: Heiko Schocher <hs@denx.de>

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index d02b1968b96f3cf2268cb748767edd51e14d582a..e0a3baee9e47c44971ab034291e4a6e5b99f4e04 100644 (file)
--- 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 905a2923e81bb4bb6df20b3a5e6d1b4dbbddf8c3..88e8d3db104b1e8400742f05bae64ccad8501017 100644 (file)
--- 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 be 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 21078cf86461e9c13b3391063d6ee3a121e3d1cb..1bd0f37add0a37f10921383f09b3609a573150bf 100644 (file)
--- 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 be 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 62ba7e084318474f85d29745f8eda90086aefbf1..7f284efe548e1189abebc874a227425f9f710272 100644 (file)
--- 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 be 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 7faa4538b2919a0a4bfdd5e235a965f415e7ebf6..bcc8140df0db0a8ffcbbda6f903ba717fae79a4b 100644 (file)
--- 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 be 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)