diff mbox

[U-Boot,v5,2/3] mx28: Let dram_init be common for mx28

Message ID 1323986861-21808-2-git-send-email-festevam@gmail.com
State Changes Requested
Delegated to: Stefano Babic
Headers show

Commit Message

Fabio Estevam Dec. 15, 2011, 10:07 p.m. UTC 
Let dram_init function be a common function, so that other mx28 boards 
can reuse it.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v4:
- Call mx28_dram_init from m28evk.c
Changes since v3:
- Rename dram_init to mx28_dram_init
 arch/arm/cpu/arm926ejs/mx28/mx28.c         |   21 +++++++++++++++++++++
 arch/arm/include/asm/arch-mx28/sys_proto.h |    1 +
 board/denx/m28evk/m28evk.c                 |   25 +++++--------------------
 3 files changed, 27 insertions(+), 20 deletions(-)

Comments

Stefano Babic Dec. 16, 2011, 8:57 a.m. UTC | #1 
On 15/12/2011 23:07, Fabio Estevam wrote:
> Let dram_init function be a common function, so that other mx28 boards 
> can reuse it.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---

> -int board_init(void)
> +int dram_init(void)
>  {
> -	/* Adress of boot parameters */
> -	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
> -
> +	mx28_dram_init();
>  	return 0;

Why not simply return mx28_dram_init() ?

We do not drop the return code if mx28_dram_init will be changed.

Best regards,
Stefano Babic
diff mbox

Patch

diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28.c b/arch/arm/cpu/arm926ejs/mx28/mx28.c
index 40ffe4c..ade3df5 100644
--- a/arch/arm/cpu/arm926ejs/mx28/mx28.c
+++ b/arch/arm/cpu/arm926ejs/mx28/mx28.c
@@ -255,6 +255,27 @@  void imx_get_mac_from_fuse(char *mac)
 }
 #endif
 
+#define	HW_DIGCTRL_SCRATCH0	0x8001c280
+#define	HW_DIGCTRL_SCRATCH1	0x8001c290
+int mx28_dram_init(void)
+{
+	uint32_t sz[2];
+
+	sz[0] = readl(HW_DIGCTRL_SCRATCH0);
+	sz[1] = readl(HW_DIGCTRL_SCRATCH1);
+
+	if (sz[0] != sz[1]) {
+		puts("MX28:\n"
+			"Error, the RAM size in HW_DIGCTRL_SCRATCH0 and\n"
+			"HW_DIGCTRL_SCRATCH1 is not the same. Please\n"
+			"verify these two registers contain valid RAM size\n");
+		hang();
+	}
+
+	gd->ram_size = sz[0];
+	return 0;
+}
+
 U_BOOT_CMD(
 	clocks,	CONFIG_SYS_MAXARGS, 1, do_mx28_showclocks,
 	"display clocks",
diff --git a/arch/arm/include/asm/arch-mx28/sys_proto.h b/arch/arm/include/asm/arch-mx28/sys_proto.h
index cf5ab16..411173e 100644
--- a/arch/arm/include/asm/arch-mx28/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx28/sys_proto.h
@@ -36,5 +36,6 @@  void mx28_common_spl_init(const iomux_cfg_t *iomux_setup,
 #endif
 
 void imx_get_mac_from_fuse(char *mac);
+int mx28_dram_init(void);
 
 #endif	/* __MX28_H__ */
diff --git a/board/denx/m28evk/m28evk.c b/board/denx/m28evk/m28evk.c
index 005446a..3225543 100644
--- a/board/denx/m28evk/m28evk.c
+++ b/board/denx/m28evk/m28evk.c
@@ -62,32 +62,17 @@  int board_early_init_f(void)
 	return 0;
 }
 
-int board_init(void)
+int dram_init(void)
 {
-	/* Adress of boot parameters */
-	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
-
+	mx28_dram_init();
 	return 0;
 }
 
-#define	HW_DIGCTRL_SCRATCH0	0x8001c280
-#define	HW_DIGCTRL_SCRATCH1	0x8001c290
-int dram_init(void)
+int board_init(void)
 {
-	uint32_t sz[2];
-
-	sz[0] = readl(HW_DIGCTRL_SCRATCH0);
-	sz[1] = readl(HW_DIGCTRL_SCRATCH1);
-
-	if (sz[0] != sz[1]) {
-		printf("MX28:\n"
-			"Error, the RAM size in HW_DIGCTRL_SCRATCH0 and\n"
-			"HW_DIGCTRL_SCRATCH1 is not the same. Please\n"
-			"verify these two registers contain valid RAM size!\n");
-		hang();
-	}
+	/* Adress of boot parameters */
+	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
-	gd->ram_size = sz[0];
 	return 0;
 }