[U-Boot] [PATCH] [NEXT]arm: Make jadecpu use relocation

[U-Boot] [PATCH] [NEXT]arm: Make jadecpu use relocation

[Matthias Weisser]

This patch modifies jadecpu board so that it is usable
with the relocation patches by Heiko Schocher

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
---
 board/syteco/jadecpu/config.mk |    2 +-
 board/syteco/jadecpu/jadecpu.c |   11 +++++++++--
 include/configs/jadecpu.h      |    3 +++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/board/syteco/jadecpu/config.mk b/board/syteco/jadecpu/config.mk
index c661f0b..91994b0 100644
--- a/board/syteco/jadecpu/config.mk
+++ b/board/syteco/jadecpu/config.mk
@@ -1 +1 @@
-TEXT_BASE = 0x46000000
+TEXT_BASE = 0x10000000
diff --git a/board/syteco/jadecpu/jadecpu.c b/board/syteco/jadecpu/jadecpu.c
index 04d2f9d..e11e686 100644
--- a/board/syteco/jadecpu/jadecpu.c
+++ b/board/syteco/jadecpu/jadecpu.c
@@ -154,12 +154,19 @@ int misc_init_r(void)
  */
 int dram_init(void)
 {
-	gd->bd->bi_dram[0].start = PHYS_SDRAM;
-	gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+	/* dram_init must store complete ramsize in gd->ram_size */
+	gd->ram_size = get_ram_size((volatile void *)PHYS_SDRAM,
+					PHYS_SDRAM_SIZE);
 
 	return 0;
 }
 
+void dram_init_banksize(void)
+{
+	gd->bd->bi_dram[0].start = PHYS_SDRAM;
+	gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
 int board_eth_init(bd_t *bis)
 {
 	int rc = 0;
diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h
index 29c534c..a5d8764 100644
--- a/include/configs/jadecpu.h
+++ b/include/configs/jadecpu.h
@@ -146,6 +146,9 @@
 #define PHYS_SDRAM		0x40000000	/* Start address of DDRRAM */
 #define PHYS_SDRAM_SIZE	0x08000000	/* 128 megs */
 
+#define CONFIG_SYS_SDRAM_BASE	PHYS_SDRAM
+#define CONFIG_SYS_INIT_SP_ADDR	0x01008000
+
 /*
  * FLASH and environment organization
  */
-- 
1.7.0.4

[U-Boot] [PATCH] [NEXT]arm: Make jadecpu use relocation

[Wolfgang Denk]

Dear Matthias Weisser,

In message <1285076264-13219-1-git-send-email-weisserm@arcor.de> you wrote:
> This patch modifies jadecpu board so that it is usable
> with the relocation patches by Heiko Schocher
> 
> Signed-off-by: Matthias Weisser <weisserm@arcor.de>
> ---
>  board/syteco/jadecpu/config.mk |    2 +-
>  board/syteco/jadecpu/jadecpu.c |   11 +++++++++--
>  include/configs/jadecpu.h      |    3 +++
>  3 files changed, 13 insertions(+), 3 deletions(-)

Applied to "next" branch, thanks.

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
Actual war is a very messy business. Very, very messy business.
	-- Kirk, "A Taste of Armageddon", stardate 3193.0

[U-Boot] [PATCH] [NEXT]arm: Make jadecpu use relocation

[Wolfgang Denk]

Dear Matthias Weisser,

In message <1285076264-13219-1-git-send-email-weisserm@arcor.de> you wrote:
> This patch modifies jadecpu board so that it is usable
> with the relocation patches by Heiko Schocher
> 
> Signed-off-by: Matthias Weisser <weisserm@arcor.de>
> ---
>  board/syteco/jadecpu/config.mk |    2 +-
>  board/syteco/jadecpu/jadecpu.c |   11 +++++++++--
>  include/configs/jadecpu.h      |    3 +++
>  3 files changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/board/syteco/jadecpu/config.mk b/board/syteco/jadecpu/config.mk
> index c661f0b..91994b0 100644
> --- a/board/syteco/jadecpu/config.mk
> +++ b/board/syteco/jadecpu/config.mk
> @@ -1 +1 @@
> -TEXT_BASE = 0x46000000
> +TEXT_BASE = 0x10000000
> diff --git a/board/syteco/jadecpu/jadecpu.c b/board/syteco/jadecpu/jadecpu.c
> index 04d2f9d..e11e686 100644
> --- a/board/syteco/jadecpu/jadecpu.c
> +++ b/board/syteco/jadecpu/jadecpu.c
> @@ -154,12 +154,19 @@ int misc_init_r(void)
>   */
>  int dram_init(void)
>  {
> -	gd->bd->bi_dram[0].start = PHYS_SDRAM;
> -	gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
> +	/* dram_init must store complete ramsize in gd->ram_size */
> +	gd->ram_size = get_ram_size((volatile void *)PHYS_SDRAM,
> +					PHYS_SDRAM_SIZE);

Unfortunately this breaks building for this board:

jadecpu.c: In function 'dram_init':
jadecpu.c:158: error: 'gd_t' has no member named 'ram_size'
jadecpu.c: In function 'dram_init_banksize':
jadecpu.c:167: error: 'gd_t' has no member named 'ram_size'


Can you please provide a fix? Thanks.

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
My play was a complete success.  The audience was a failure.

[U-Boot] [PATCH] [NEXT]arm: Make jadecpu use relocation

[Matthias Weißer]

Hello Wolfgang

Am 05.10.2010 20:41, schrieb Wolfgang Denk:
> Dear Matthias Weisser,
>> -	gd->bd->bi_dram[0].start = PHYS_SDRAM;
>> -	gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
>> +	/* dram_init must store complete ramsize in gd->ram_size */
>> +	gd->ram_size = get_ram_size((volatile void *)PHYS_SDRAM,
>> +					PHYS_SDRAM_SIZE);
>
> Unfortunately this breaks building for this board:
>
> jadecpu.c: In function 'dram_init':
> jadecpu.c:158: error: 'gd_t' has no member named 'ram_size'
> jadecpu.c: In function 'dram_init_banksize':
> jadecpu.c:167: error: 'gd_t' has no member named 'ram_size'
>
> Can you please provide a fix? Thanks.

I am not sure how to fix this. gd_t contains a member ram_size if 
CONFIG_SYS_ARM_WITHOUT_RELOC is not defined. This is the case for our 
jadecpu board.

Also the patch is in current master branch and builds cleanly here.

Matthias

[U-Boot] [PATCH] [NEXT]arm: Make jadecpu use relocation

[Wolfgang Denk]

Dear =?ISO-8859-1?Q?Matthias_Wei=DFer?=,

In message <4CB2DDE8.6040908@arcor.de> you wrote:
> 
> > Unfortunately this breaks building for this board:
...
> I am not sure how to fix this. gd_t contains a member ram_size if 
> CONFIG_SYS_ARM_WITHOUT_RELOC is not defined. This is the case for our 
> jadecpu board.
> 
> Also the patch is in current master branch and builds cleanly here.

Confirmed.

Sorry for the confusion. I just did not expect that the board might
build without CONFIG_SYS_ARM_WITHOUT_RELOC ;-)

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
"More software projects have gone awry for lack of calendar time than
for all other causes combined."
                         - Fred Brooks, Jr., _The Mythical Man Month_