Patchwork [U-Boot] mx51evk: Fix number of DDR banks

login
register
mail settings
Submitter Fabio Estevam
Date May 19, 2011, 4:32 p.m.
Message ID <1305822752-26461-1-git-send-email-fabio.estevam@freescale.com>
Download mbox | patch
Permalink /patch/96416/
State Rejected
Delegated to: Stefano Babic
Headers show

Comments

Fabio Estevam - May 19, 2011, 4:32 p.m.
MX51EVK board has 2 banks of 256MB DDR memories instead of a single one with 512MB.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 board/freescale/mx51evk/mx51evk.c |   18 +++++++++++++++---
 include/configs/mx51evk.h         |    7 +++++--
 2 files changed, 20 insertions(+), 5 deletions(-)
Stefano Babic - May 20, 2011, 7:58 a.m.
On 05/19/2011 06:32 PM, Fabio Estevam wrote:
> MX51EVK board has 2 banks of 256MB DDR memories instead of a single one with 512MB.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---

Hi Fabio,

>  board/freescale/mx51evk/mx51evk.c |   18 +++++++++++++++---
>  include/configs/mx51evk.h         |    7 +++++--
>  2 files changed, 20 insertions(+), 5 deletions(-)
> 
> diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
> index e2d3d74..ef7c6e4 100644
> --- a/board/freescale/mx51evk/mx51evk.c
> +++ b/board/freescale/mx51evk/mx51evk.c
> @@ -52,11 +52,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;
> +

Do we really need this patch ? I am trying to understand. I think we
need always to set up two (or more) banks if there is a hole between the
two banks. For example, if it would be possible to install a memory with
a smaller size. This is the case of the MX53loco, because the range
between CSD0 and CSD1 is 1GB.

This is not the case of the mx51evk, if I am correct. CSD0 and CSD1
address each 256MB, and memory from the software point of view is
contiguous.

Best regards,
Stefano Babic

Patch

diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index e2d3d74..ef7c6e4 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -52,11 +52,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/mx51evk.h b/include/configs/mx51evk.h
index 207b20c..2dc3dff 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -198,9 +198,12 @@ 
 /*-----------------------------------------------------------------------
  * Physical Memory Map
  */
-#define CONFIG_NR_DRAM_BANKS	1
+#define CONFIG_NR_DRAM_BANKS	2
 #define PHYS_SDRAM_1		CSD0_BASE_ADDR
-#define PHYS_SDRAM_1_SIZE	(512 * 1024 * 1024)
+#define PHYS_SDRAM_1_SIZE	(256 * 1024 * 1024)
+#define PHYS_SDRAM_2		CSD1_BASE_ADDR
+#define PHYS_SDRAM_2_SIZE	(256 * 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)