public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Marek Vasut <marek.vasut@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 2/3] mx28: Let dram_init be common for mx28
Date: Thu, 15 Dec 2011 18:23:19 +0100	[thread overview]
Message-ID: <201112151823.19467.marek.vasut@gmail.com> (raw)
In-Reply-To: <1323966067-28333-2-git-send-email-fabio.estevam@freescale.com>

> 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

  reply	other threads:[~2011-12-15 17:23 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-15 16:21 [U-Boot] [PATCH v2 1/3] mx28: Let imx_get_mac_from_fuse be common for mx28 Fabio Estevam
2011-12-15 16:21 ` [U-Boot] [PATCH v2 2/3] mx28: Let dram_init " Fabio Estevam
2011-12-15 17:23   ` Marek Vasut [this message]
2011-12-15 16:21 ` [U-Boot] [PATCH v2 3/3] mx28evk: Add initial support for MX28EVK board Fabio Estevam
2011-12-15 16:42   ` Stefano Babic
2011-12-15 16:49     ` Fabio Estevam
2011-12-15 16:34 ` [U-Boot] [PATCH v3 1/3] mx28: Let imx_get_mac_from_fuse be common for mx28 Fabio Estevam
2011-12-15 17:24   ` Marek Vasut
2011-12-15 17:53   ` Stefano Babic
2011-12-17 19:57     ` Wolfgang Denk
2011-12-15 16:34 ` [U-Boot] [PATCH v3 2/3] mx28: Let dram_init " Fabio Estevam
2011-12-15 16:34 ` [U-Boot] [PATCH v3 3/3] mx28evk: Add initial support for MX28EVK board Fabio Estevam
2011-12-15 17:25   ` Marek Vasut
2011-12-15 20:42     ` Fabio Estevam
2011-12-15 17:22 ` [U-Boot] [PATCH v2 1/3] mx28: Let imx_get_mac_from_fuse be common for mx28 Marek Vasut
2011-12-16  8:55   ` Stefano Babic
2011-12-16  9:53     ` Marek Vasut
2011-12-16 10:04       ` Stefano Babic
2011-12-16 10:39         ` Marek Vasut
2011-12-16 10:55           ` Stefano Babic
2011-12-16 10:56             ` Marek Vasut
2011-12-15 20:38 ` [U-Boot] [PATCH v4 " Fabio Estevam
2011-12-15 20:38 ` [U-Boot] [PATCH v4 2/3] mx28: Let dram_init " Fabio Estevam
2011-12-15 20:38 ` [U-Boot] [PATCH v4 3/3] mx28evk: Add initial support for MX28EVK board Fabio Estevam
2011-12-15 22:07 ` [U-Boot] [PATCH v5 1/3] mx28: Let imx_get_mac_from_fuse be common for mx28 Fabio Estevam
2011-12-16  9:49   ` Marek Vasut
2011-12-15 22:07 ` [U-Boot] [PATCH v5 2/3] mx28: Let dram_init " Fabio Estevam
2011-12-16  8:57   ` Stefano Babic
2011-12-15 22:07 ` [U-Boot] [PATCH v5 3/3] mx28evk: Add initial support for MX28EVK board Fabio Estevam
2011-12-16  9:02   ` Stefano Babic
2011-12-16  9:51   ` Marek Vasut
2011-12-16 14:55   ` Veli-Pekka Peltola
2011-12-17  2:13     ` Fabio Estevam
2011-12-17  3:17     ` Marek Vasut
2011-12-19 14:10       ` Veli-Pekka Peltola

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201112151823.19467.marek.vasut@gmail.com \
    --to=marek.vasut@gmail.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox