Skip to contentSkip to conversation

integratorap: support relocation

PATCH Superseded Linus Walleij 2 participants 4 messages Jul 23, 2011 – Jul 25, 2011

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 3/9 integratorap: support relocation

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.

---
 board/armltd/integrator/integrator.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
board/armltd/integrator/integrator.c +8 -6
index 9bb56b5..a0d8de7 100644
@@ -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
 	{
Signature · 1 line
1.7.6
#1 lore raw

PATCH v3 3/9 integratorap: support relocation

Hello.

Quoted 17 lines · Linus Walleij

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.

---
  board/armltd/integrator/integrator.c |   14 ++++++++------
  1 files changed, 8 insertions(+), 6 deletions(-)
board/armltd/integrator/integrator.c +0 -0
index 9bb56b5..a0d8de7 100644
@@ -86,14 +86,16 @@ int misc_init_r (void)
  	return (0);
  }
 

board/armltd/integrator/integrator.c int misc_init_r (void) · line 92

Quoted 10 lines
board/armltd/integrator/integrator.c +2 -6
-/******************************
- 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

#2 lore raw

PATCH v3 3/9 integratorap: support relocation

Quoted 8 lines · Sergei Shtylyov
Quoted 6 lines
board/armltd/integrator/integrator.c +1 -1
-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

#3 lore raw

PATCH v3 3/9 integratorap: support relocation

Quoted 10 lines · Linus Walleij
Quoted 8 lines · Sergei Shtylyov
Quoted 6 lines
board/armltd/integrator/integrator.c +1 -1
-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...

Quoted 2 lines

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