Patchwork [U-Boot,3/9,v3] integratorap: support relocation

login
register
mail settings
Submitter Linus Walleij
Date July 23, 2011, 1:37 p.m.
Message ID <1311428278-14807-1-git-send-email-linus.walleij@linaro.org>
Download mbox | patch
Permalink /patch/106464/
State Superseded
Delegated to: Albert ARIBAUD
Headers show

Comments

Linus Walleij - July 23, 2011, 1:37 p.m.
The integrator board was apparently never converted over to support
relocation until now. After this the integrator u-boot both compiles
and boots on the Integrator AP.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 board/armltd/integrator/integrator.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
Sergei Shtylyov - July 25, 2011, 10:46 a.m.
Hello.

On 23-07-2011 17:37, Linus Walleij wrote:

> The integrator board was apparently never converted over to support
> relocation until now. After this the integrator u-boot both compiles
> and boots on the Integrator AP.

> Signed-off-by: Linus Walleij<linus.walleij@linaro.org>
> ---
>   board/armltd/integrator/integrator.c |   14 ++++++++------
>   1 files changed, 8 insertions(+), 6 deletions(-)

> diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c
> index 9bb56b5..a0d8de7 100644
> --- a/board/armltd/integrator/integrator.c
> +++ b/board/armltd/integrator/integrator.c
> @@ -86,14 +86,16 @@ int misc_init_r (void)
>   	return (0);
>   }
>
> -/******************************
> - Routine:
> - Description:
> -******************************/
> -int dram_init (void)
> +void dram_init_banksize(void)
>   {
>   	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
> -	gd->bd->bi_dram[0].size	 = PHYS_SDRAM_1_SIZE;
> +        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;

    You're using spaces instead of tab here...

WBR, Sergei
Linus Walleij - July 25, 2011, 11:22 a.m.
On Mon, Jul 25, 2011 at 12:46 PM, Sergei Shtylyov <sshtylyov@mvista.com> wrote:
>> -int dram_init (void)
>> +void dram_init_banksize(void)
>>  {
>>        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
>> -       gd->bd->bi_dram[0].size  = PHYS_SDRAM_1_SIZE;
>> +        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
>
>   You're using spaces instead of tab here...

Oh man. I'll fix up. I re-ran all patches through checkpatch and this
one seems to be the only one remaining with the problem, luckily.

Linus Walleij
Linus Walleij - July 25, 2011, 11:26 a.m.
On Mon, Jul 25, 2011 at 1:22 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Mon, Jul 25, 2011 at 12:46 PM, Sergei Shtylyov <sshtylyov@mvista.com> wrote:
>>> -int dram_init (void)
>>> +void dram_init_banksize(void)
>>>  {
>>>        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
>>> -       gd->bd->bi_dram[0].size  = PHYS_SDRAM_1_SIZE;
>>> +        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
>>
>>   You're using spaces instead of tab here...
>
> Oh man. I'll fix up. I re-ran all patches through checkpatch and this
> one seems to be the only one remaining with the problem, luckily.

Or well, patch [6/9] fixes the problem.

It's probably better that I squash patch 3 and 6.

This means the whole series need to be rebased again of course,
so I'm resending the whole thing again.

Thanks,
Linus Walleij

Patch

diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c
index 9bb56b5..a0d8de7 100644
--- a/board/armltd/integrator/integrator.c
+++ b/board/armltd/integrator/integrator.c
@@ -86,14 +86,16 @@  int misc_init_r (void)
 	return (0);
 }
 
-/******************************
- Routine:
- Description:
-******************************/
-int dram_init (void)
+void dram_init_banksize(void)
 {
 	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-	gd->bd->bi_dram[0].size	 = PHYS_SDRAM_1_SIZE;
+        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
+}
+
+int dram_init (void)
+{
+	gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
+				    PHYS_SDRAM_1_SIZE);
 
 #ifdef CONFIG_CM_SPD_DETECT
 	{