Message ID | 1323966067-28333-2-git-send-email-fabio.estevam@freescale.com |
---|---|
State | Superseded |
Delegated to: | Stefano Babic |
Headers | show |
> 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> > --- > arch/arm/cpu/arm926ejs/mx28/mx28.c | 21 +++++++++++++++++++++ > arch/arm/include/asm/arch-mx28/sys_proto.h | 1 + > board/denx/m28evk/m28evk.c | 21 --------------------- > 3 files changed, 22 insertions(+), 21 deletions(-) > > diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28.c > b/arch/arm/cpu/arm926ejs/mx28/mx28.c index 785978f..ec8eaf9 100644 > --- a/arch/arm/cpu/arm926ejs/mx28/mx28.c > +++ b/arch/arm/cpu/arm926ejs/mx28/mx28.c > @@ -249,6 +249,27 @@ void imx_get_mac_from_fuse(char *mac) > } > #endif > > +#define HW_DIGCTRL_SCRATCH0 0x8001c280 > +#define HW_DIGCTRL_SCRATCH1 0x8001c290 > +int 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..745b84d 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 dram_init(void); Rename it to mx28_dram_init() or something please. > > #endif /* __MX28_H__ */ > diff --git a/board/denx/m28evk/m28evk.c b/board/denx/m28evk/m28evk.c > index 005446a..d6a2a50 100644 > --- a/board/denx/m28evk/m28evk.c > +++ b/board/denx/m28evk/m28evk.c > @@ -70,27 +70,6 @@ int board_init(void) > return 0; > } > > -#define HW_DIGCTRL_SCRATCH0 0x8001c280 > -#define HW_DIGCTRL_SCRATCH1 0x8001c290 > -int dram_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(); > - } > - > - gd->ram_size = sz[0]; > - return 0; > -} > - > #ifdef CONFIG_CMD_MMC > static int m28_mmc_wp(int id) > { M
diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28.c b/arch/arm/cpu/arm926ejs/mx28/mx28.c index 785978f..ec8eaf9 100644 --- a/arch/arm/cpu/arm926ejs/mx28/mx28.c +++ b/arch/arm/cpu/arm926ejs/mx28/mx28.c @@ -249,6 +249,27 @@ void imx_get_mac_from_fuse(char *mac) } #endif +#define HW_DIGCTRL_SCRATCH0 0x8001c280 +#define HW_DIGCTRL_SCRATCH1 0x8001c290 +int 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..745b84d 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 dram_init(void); #endif /* __MX28_H__ */ diff --git a/board/denx/m28evk/m28evk.c b/board/denx/m28evk/m28evk.c index 005446a..d6a2a50 100644 --- a/board/denx/m28evk/m28evk.c +++ b/board/denx/m28evk/m28evk.c @@ -70,27 +70,6 @@ int board_init(void) return 0; } -#define HW_DIGCTRL_SCRATCH0 0x8001c280 -#define HW_DIGCTRL_SCRATCH1 0x8001c290 -int dram_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(); - } - - gd->ram_size = sz[0]; - return 0; -} - #ifdef CONFIG_CMD_MMC static int m28_mmc_wp(int id) {
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> --- arch/arm/cpu/arm926ejs/mx28/mx28.c | 21 +++++++++++++++++++++ arch/arm/include/asm/arch-mx28/sys_proto.h | 1 + board/denx/m28evk/m28evk.c | 21 --------------------- 3 files changed, 22 insertions(+), 21 deletions(-)