mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-26 06:30:39 +00:00
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>
This commit is contained in:
parent
a784c01adc
commit
11080ab66d
5 changed files with 0 additions and 5 deletions
|
@ -138,7 +138,6 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* additions for new relocation code, must added to all boards */
|
/* 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_SDRAM_BASE 0xc0000000
|
||||||
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \
|
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \
|
||||||
CONFIG_SYS_GBL_DATA_SIZE)
|
CONFIG_SYS_GBL_DATA_SIZE)
|
||||||
|
|
|
@ -236,7 +236,6 @@
|
||||||
"mtdparts=" MTDPARTS_DEFAULT "\0" \
|
"mtdparts=" MTDPARTS_DEFAULT "\0" \
|
||||||
|
|
||||||
/* additions for new relocation code, must be added to all boards */
|
/* 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_SDRAM_BASE PHYS_SDRAM_1
|
||||||
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \
|
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \
|
||||||
CONFIG_SYS_GBL_DATA_SIZE)
|
CONFIG_SYS_GBL_DATA_SIZE)
|
||||||
|
|
|
@ -341,7 +341,6 @@ extern unsigned int boot_flash_type;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* additions for new relocation code, must be added to all boards */
|
/* 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_SDRAM_BASE PHYS_SDRAM_1
|
||||||
#define CONFIG_SYS_INIT_SP_ADDR (LOW_LEVEL_SRAM_STACK - CONFIG_SYS_GBL_DATA_SIZE)
|
#define CONFIG_SYS_INIT_SP_ADDR (LOW_LEVEL_SRAM_STACK - CONFIG_SYS_GBL_DATA_SIZE)
|
||||||
|
|
||||||
|
|
|
@ -283,7 +283,6 @@ extern int qong_nand_rdy(void *chip);
|
||||||
"128k(env2),2432k(kernel),13m(ramdisk),-(user)"
|
"128k(env2),2432k(kernel),13m(ramdisk),-(user)"
|
||||||
|
|
||||||
/* additions for new relocation code, must be added to all boards */
|
/* 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_SDRAM_BASE 0x80000000
|
||||||
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
|
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
|
||||||
#define CONFIG_SYS_INIT_RAM_END IRAM_SIZE
|
#define CONFIG_SYS_INIT_RAM_END IRAM_SIZE
|
||||||
|
|
|
@ -177,7 +177,6 @@
|
||||||
"upd=run load update\0" \
|
"upd=run load update\0" \
|
||||||
|
|
||||||
/* additions for new relocation code, must be added to all boards */
|
/* 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_SDRAM_BASE PHYS_SDRAM_1
|
||||||
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \
|
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \
|
||||||
CONFIG_SYS_GBL_DATA_SIZE)
|
CONFIG_SYS_GBL_DATA_SIZE)
|
||||||
|
|
Loading…
Reference in a new issue