diff options
| author | Ben Gardiner <bengardiner@nanometrics.ca> | 2010-09-22 17:32:49 -0400 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-13 09:57:47 +0200 |
| commit | 11080ab66dc2c7f36e03f2cf7a8d86d94a58869f (patch) | |
| tree | fa8aafa79c88075c0b756fdb8d68df300a4da410 | |
| parent | a784c01adcefe3efd4e651c5230e6117a7be35f8 (diff) | |
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>
| -rw-r--r-- | include/configs/da850evm.h | 1 | ||||
| -rw-r--r-- | include/configs/imx27lite-common.h | 1 | ||||
| -rw-r--r-- | include/configs/omap3_beagle.h | 1 | ||||
| -rw-r--r-- | include/configs/qong.h | 1 | ||||
| -rw-r--r-- | 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 d02b1968b..e0a3baee9 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 905a2923e..88e8d3db1 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 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 21078cf86..1bd0f37ad 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 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 62ba7e084..7f284efe5 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 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 7faa4538b..bcc8140df 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 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) |