Skip to contentSkip to conversation

arm-reloc: don't undef CONFIG_SYS_ARM_WITHOUT_RELOC

PATCH New Ben Gardiner 3 participants 3 messages Sep 22, 2010 – Oct 12, 2010 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm-reloc: 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.

CC Heiko Schocher <[email protected]>
---
 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(-)
include/configs/da850evm.h +0 -1
index d02b196..e0a3bae 100644
@@ -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)
include/configs/imx27lite-common.h +0 -1
index 812e5f2..4f7d61d 100644
@@ -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)
include/configs/omap3_beagle.h +0 -1
index 2463be4..ce658d1 100644
@@ -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)
 
include/configs/qong.h +0 -1
index 7a68b7b..b9144eb 100644
@@ -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
include/configs/tx25.h +0 -1
index c798570..85f166e 100644
@@ -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)
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 arm-reloc: don't undef CONFIG_SYS_ARM_WITHOUT_RELOC

Hello Ben,

Quoted 3 lines · Ben Gardiner

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.

Good catch, thanks!

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#2 lore raw

PATCH 1/1 arm-reloc: don't undef CONFIG_SYS_ARM_WITHOUT_RELOC

In reply to Ben Gardiner

Dear Ben Gardiner,

Quoted 7 lines · In message <[email protected]> you…

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.

CC Heiko Schocher <[email protected]>
Quoted 7 lines
---
 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(-)

Aplied to u-boot-arm, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
To be sure of hitting the target, shoot first and, whatever you  hit,
call it the target.