V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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.

This also fixes the SDRAM memory size detection.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2011-07-25 01:50:08 +00:00 committed by Albert ARIBAUD
parent a46877cc47
commit 26c82638c9
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
board/armltd/integrator/integrator.c
View File

@ -86,15 +86,9 @@ int misc_init_r (void)
return (0); return (0);
} }
/******************************
Routine:
Description:
******************************/
int dram_init (void) int dram_init (void)
{ {
gd->bd->bi_dram[0].start = PHYS_SDRAM_1; gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
#ifdef CONFIG_CM_SPD_DETECT #ifdef CONFIG_CM_SPD_DETECT
{ {
extern void dram_query(void); extern void dram_query(void);
@ -118,8 +112,13 @@ extern void dram_query(void);
*/ */
sdram_shift = ((cm_reg_sdram & 0x0000001C)/4)%4; sdram_shift = ((cm_reg_sdram & 0x0000001C)/4)%4;
gd->bd->bi_dram[0].size = 0x01000000 << sdram_shift; gd->bd->bi_dram[0].size = 0x01000000 << sdram_shift;
gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
0x01000000 << sdram_shift);
} }
#else
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
PHYS_SDRAM_1_SIZE);
#endif /* CM_SPD_DETECT */ #endif /* CM_SPD_DETECT */
return 0; return 0;

2
include/configs/integratorap.h
View File

@ -47,7 +47,7 @@
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_CM_INIT 1 #define CONFIG_CM_INIT 1
#define CONFIG_CM_REMAP 1 #define CONFIG_CM_REMAP 1
#undef CONFIG_CM_SPD_DETECT #define CONFIG_CM_SPD_DETECT
/* /*
* Size of malloc() pool * Size of malloc() pool