[U-Boot] [PATCH] da850evm: remove GENERATED_GBL_DATA_SIZE from initial stack

[U-Boot] [PATCH] da850evm: remove GENERATED_GBL_DATA_SIZE from initial stack

[Ben Gardiner]

Commit 25ddd1fb0a2281b182529afbc8fda5de2dc16d96 broke the da850evm build. The
introduction of GENERATED_GBL_DATA_SIZE led to:

$make mrproper ; make da850evm_config ; make -j9 all|grep -E '( error| warning)'
Generating include/autoconf.mk
Generating include/autoconf.mk.dep
awk '(NF && $1 !~ /^#/) { print $1 ": " $1 "_config; $(MAKE)" }' boards.cfg > .boards.depend
Configuring for da850evm board...
start.S: Assembler messages:
start.S:177: Error: missing ')'
start.S:177: Error: missing ')'
start.S:177: Error: garbage following instruction -- `ldr sp,=((0xc0000000+0x1000-#96))'
make[1]: *** [start.o] Error 1
make: *** [arch/arm/cpu/arm926ejs/start.o] Error 2
make: *** Waiting for unfinished jobs....

This patch removes from the definition of CONFIG_SYS_INIT_SP_ADDR the
GENERATED_GBL_DATA_SIZE offset -- it doesn't appear to be needed since the
resulting u-boot works fine; tested with NAND, env.oob and tftp.

Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
CC: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
CC: Sandeep Paulraj <s-paulraj@ti.com>
--

If GENERATED_GBL_DATA_SIZE were defined as '96' and not '#96' this would also
fix the problem. I assumed that the 'immeadiate' prefix is preferred in the
definition of the GENERATED_GBL_DATA_SIZE macro.

---
 include/configs/da850evm.h |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 7b04be0..2695785 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -191,6 +191,5 @@
 
 /* additions for new relocation code, must added to all boards */
 #define CONFIG_SYS_SDRAM_BASE		0xc0000000
-#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \
-					GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x1000)
 #endif /* __CONFIG_H */
-- 
1.7.0.4

[U-Boot] [PATCH] da850evm: remove GENERATED_GBL_DATA_SIZE from initial stack

[Heiko Schocher]

Hello Ben,

Ben Gardiner wrote:
> Commit 25ddd1fb0a2281b182529afbc8fda5de2dc16d96 broke the da850evm build. The
> introduction of GENERATED_GBL_DATA_SIZE led to:
> 
> $make mrproper ; make da850evm_config ; make -j9 all|grep -E '( error| warning)'
> Generating include/autoconf.mk
> Generating include/autoconf.mk.dep
> awk '(NF && $1 !~ /^#/) { print $1 ": " $1 "_config; $(MAKE)" }' boards.cfg > .boards.depend
> Configuring for da850evm board...
> start.S: Assembler messages:
> start.S:177: Error: missing ')'
> start.S:177: Error: missing ')'
> start.S:177: Error: garbage following instruction -- `ldr sp,=((0xc0000000+0x1000-#96))'
> make[1]: *** [start.o] Error 1
> make: *** [arch/arm/cpu/arm926ejs/start.o] Error 2
> make: *** Waiting for unfinished jobs....
> 
> This patch removes from the definition of CONFIG_SYS_INIT_SP_ADDR the
> GENERATED_GBL_DATA_SIZE offset -- it doesn't appear to be needed since the
> resulting u-boot works fine; tested with NAND, env.oob and tftp.

Not necessary, already fixed here:

http://lists.denx.de/pipermail/u-boot/2010-October/080455.html

Can you try instead this patch?

Thanks!

bye,
Heiko
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[U-Boot] [PATCH] da850evm: remove GENERATED_GBL_DATA_SIZE from initial stack

[Ben Gardiner]

Hello Heiko,

On Wed, Oct 27, 2010 at 10:35 AM, Heiko Schocher <hs@denx.de> wrote:
> Hello Ben,
>
> Ben Gardiner wrote:
>> Commit 25ddd1fb0a2281b182529afbc8fda5de2dc16d96 broke the da850evm build. The
>> introduction of GENERATED_GBL_DATA_SIZE led to:
> [...]
> Not necessary, already fixed here:
>
> http://lists.denx.de/pipermail/u-boot/2010-October/080455.html
>
> Can you try instead this patch?

Thanks, Heiko That fixes it.

Best Regards,
Ben Gardiner

---
Nanometrics Inc.
http://www.nanometrics.ca