| Message ID | 1305812698-3955-2-git-send-email-fabio.estevam@freescale.com |
|---|---|
| State | Superseded |
| Headers | show |
On 05/19/2011 03:44 PM, Fabio Estevam wrote: > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > --- > board/freescale/mx53smd/mx53smd.c | 18 +++++++++++++++--- > include/configs/mx53smd.h | 3 +++ > 2 files changed, 18 insertions(+), 3 deletions(-) > > diff --git a/board/freescale/mx53smd/mx53smd.c b/board/freescale/mx53smd/mx53smd.c > index 2d158f7..f3c433f 100644 > --- a/board/freescale/mx53smd/mx53smd.c > +++ b/board/freescale/mx53smd/mx53smd.c > @@ -42,11 +42,23 @@ u32 get_board_rev(void) > > int dram_init(void) > { > - /* dram_init must store complete ramsize in gd->ram_size */ > - gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE, > - PHYS_SDRAM_1_SIZE); > + u32 size1, size2; > + > + size1 = get_ram_size((volatile void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE); > + size2 = get_ram_size((volatile void *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE); > + > + gd->ram_size = size1 + size2; > + > return 0; mmmhhh...I merged your first patch on this board, but I have not yet request a pull to u-boot arm. These two patches solved two problems with the first patch. What do you think if I squash all three patches together ? Regards, Stefano
On 5/19/2011 12:03 PM, Stefano Babic wrote: ... > mmmhhh...I merged your first patch on this board, but I have not yet > request a pull to u-boot arm. These two patches solved two problems with > the first patch. What do you think if I squash all three patches together ? Yes, squashing the 3 patches is fine. Thanks, Fabio Estevam
diff --git a/board/freescale/mx53smd/mx53smd.c b/board/freescale/mx53smd/mx53smd.c index 2d158f7..f3c433f 100644 --- a/board/freescale/mx53smd/mx53smd.c +++ b/board/freescale/mx53smd/mx53smd.c @@ -42,11 +42,23 @@ u32 get_board_rev(void) int dram_init(void) { - /* dram_init must store complete ramsize in gd->ram_size */ - gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE, - PHYS_SDRAM_1_SIZE); + u32 size1, size2; + + size1 = get_ram_size((volatile void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE); + size2 = get_ram_size((volatile void *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE); + + gd->ram_size = size1 + size2; + return 0; } +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[1].start = PHYS_SDRAM_2; + gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; +} static void setup_iomux_uart(void) { diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index e64ff98..65d5e05 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -165,6 +165,9 @@ #define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1_SIZE (512 * 1024 * 1024) +#define PHYS_SDRAM_2 CSD1_BASE_ADDR +#define PHYS_SDRAM_2_SIZE (512 * 1024 * 1024) +#define PHYS_SDRAM_SIZE (PHYS_SDRAM_1_SIZE + PHYS_SDRAM_2_SIZE) #define CONFIG_SYS_SDRAM_BASE (PHYS_SDRAM_1) #define CONFIG_SYS_INIT_RAM_ADDR (IRAM_BASE_ADDR)
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> --- board/freescale/mx53smd/mx53smd.c | 18 +++++++++++++++--- include/configs/mx53smd.h | 3 +++ 2 files changed, 18 insertions(+), 3 deletions(-)