[U-Boot] [PATCH v3] [NEXT] da830: fixup ARM relocation support

[U-Boot] [PATCH v3] [NEXT] da830: fixup ARM relocation support

[Nick Thompson]

Fixes build breakage in da830evm after commit
97003756249bd790910417eb66f0039bbf06a02c "da8xx: fixup ARM
relocation support"

The da8xx fixup commit changed da830/da850 common code to make
relocation work in da850, but didn't add the required defines
to da830evm_config.h resulting in build failure in the common code.

This patch adds those defines for da830, but makes no sense without
also referring to the commit mentioned above.

Signed-off-by: Nick Thompson <nick.thompson@ge.com>
Reviewed-by: Ben Gardiner <bengardiner@nanometrics.ca>
---
Changes since v1:
removed CONFIG_SKIP_RELOCATE_UBOOT

Changes since v2:
removed "#undef CONFIG_SYS_ARM_WITHOUT_RELOC" as it is not defined
in the first place.

 include/configs/da830evm.h |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index 160ece2..b87e90c 100644
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -41,15 +41,13 @@
 #define CONFIG_SYS_HZ_CLOCK		clk_get(DAVINCI_AUXCLK_CLKID)
 #define CONFIG_SYS_HZ			1000
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SKIP_RELOCATE_UBOOT	/* to a proper address, init done */
 
 /*
  * Memory Info
  */
 #define CONFIG_SYS_MALLOC_LEN	(0x10000 + 1*1024*1024) /* malloc() len */
 #define CONFIG_SYS_GBL_DATA_SIZE	128 /* reserved for initial data */
-#define PHYS_SDRAM_1		DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
-#define PHYS_SDRAM_1_SIZE	(64 << 20) /* SDRAM size 64MB */
+#define PHYS_SDRAM_1			0xc0000000 /* SDRAM Start */
 #define CONFIG_SYS_MEMTEST_START	PHYS_SDRAM_1 /* memtest start addr */
 #define CONFIG_SYS_MEMTEST_END 	(PHYS_SDRAM_1 + 16*1024*1024) /* 16MB test */
 #define CONFIG_NR_DRAM_BANKS	1 /* we have 1 bank of DRAM */
@@ -281,4 +279,11 @@
 	"mtdparts=davinci_nand.1:" PART_BOOT PART_PARAMS PART_KERNEL PART_REST
 #endif
 
+#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
+
+/* additions for new relocation code, must be added to all boards */
+#define CONFIG_SYS_SDRAM_BASE           PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR         \
+	(CONFIG_SYS_SDRAM_BASE + 0x1000 - CONFIG_SYS_GBL_DATA_SIZE)
+
 #endif /* __CONFIG_H */
-- 
1.7.0.4

[U-Boot] [PATCH v3] [NEXT] da830: fixup ARM relocation support

[Nick Thompson]

On 23/09/10 10:32, Nick Thompson wrote:
> Fixes build breakage in da830evm after commit
> 97003756249bd790910417eb66f0039bbf06a02c "da8xx: fixup ARM
> relocation support"
> 
> The da8xx fixup commit changed da830/da850 common code to make
> relocation work in da850, but didn't add the required defines
> to da830evm_config.h resulting in build failure in the common code.
> 
> This patch adds those defines for da830, but makes no sense without
> also referring to the commit mentioned above.
> 
> Signed-off-by: Nick Thompson <nick.thompson@ge.com>
> Reviewed-by: Ben Gardiner <bengardiner@nanometrics.ca>
> ---
> Changes since v1:
> removed CONFIG_SKIP_RELOCATE_UBOOT
> 
> Changes since v2:
> removed "#undef CONFIG_SYS_ARM_WITHOUT_RELOC" as it is not defined
> in the first place.
> 
>  include/configs/da830evm.h |   11 ++++++++---
>  1 files changed, 8 insertions(+), 3 deletions(-)

Hi Sandeep,

Does this patch need to go through the TI tree? It brings da830 in
line with da850.

Thanks,
Nick.

[U-Boot] [PATCH v3] [NEXT] da830: fixup ARM relocation support

[Nick Thompson]

http://article.gmane.org/gmane.comp.boot-loaders.u-boot/84921

There have been no further comments since I posted v3 of this
patch 4 weeks ago. It still applies cleanly to my newly updated
tree of u-boot. da830evm will not build without it.

Can this patch be commited?

Thanks,
Nick.

On 23/09/10 10:32, Nick Thompson wrote:
> Fixes build breakage in da830evm after commit
> 97003756249bd790910417eb66f0039bbf06a02c "da8xx: fixup ARM
> relocation support"
> 
> The da8xx fixup commit changed da830/da850 common code to make
> relocation work in da850, but didn't add the required defines
> to da830evm_config.h resulting in build failure in the common code.
> 
> This patch adds those defines for da830, but makes no sense without
> also referring to the commit mentioned above.
> 
> Signed-off-by: Nick Thompson <nick.thompson@ge.com>
> Reviewed-by: Ben Gardiner <bengardiner@nanometrics.ca>
> ---
> Changes since v1:
> removed CONFIG_SKIP_RELOCATE_UBOOT
> 
> Changes since v2:
> removed "#undef CONFIG_SYS_ARM_WITHOUT_RELOC" as it is not defined
> in the first place.
> 
>  include/configs/da830evm.h |   11 ++++++++---
>  1 files changed, 8 insertions(+), 3 deletions(-)

[U-Boot] [PATCH v3] [NEXT] da830: fixup ARM relocation support

[Wolfgang Denk]

Dear Nick Thompson,

In message <4CC53F29.2050105@ge.com> you wrote:
> http://article.gmane.org/gmane.comp.boot-loaders.u-boot/84921
> 
> There have been no further comments since I posted v3 of this
> patch 4 weeks ago. It still applies cleanly to my newly updated
> tree of u-boot. da830evm will not build without it.

I am aware of this. IIRC there are other TI specific patches pending,
too.

> Can this patch be commited?

I'm waiting for Sandeep's pull request.

Best regards,

Wolfgang Denk

-- 
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
"It's when they say 2 + 2 = 5 that I begin to argue."    - Eric Pepke