[U-Boot] [PATCH V2 08/23] imx: cpu: update cpu file to support i.MX8M

Stefano Babic sbabic at denx.de
Thu Dec 7 08:40:27 UTC 2017


On 04/12/2017 05:31, Peng Fan wrote:
> Update get_reset_cause to reflect i.MX8M
> Compile out get_ahb_clk and set_chipselect_size for i.MX8M
> 
> Signed-off-by: Peng Fan <peng.fan at nxp.com>
> ---
>  arch/arm/mach-imx/cpu.c | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
> index 18205dc984..c811252733 100644
> --- a/arch/arm/mach-imx/cpu.c
> +++ b/arch/arm/mach-imx/cpu.c
> @@ -62,6 +62,11 @@ static char *get_reset_cause(void)
>  		return "WDOG4";
>  	case 0x00200:
>  		return "TEMPSENSE";
> +#elif defined(CONFIG_MX8M)
> +	case 0x00100:
> +		return "WDOG2";
> +	case 0x00200:
> +		return "TEMPSENSE";
>  #else
>  	case 0x00100:
>  		return "TEMPSENSE";
> @@ -137,6 +142,8 @@ unsigned imx_ddr_size(void)
>  const char *get_imx_type(u32 imxtype)
>  {
>  	switch (imxtype) {
> +	case MXC_CPU_MX8MQ:
> +		return "8MQ";	/* Quad-core version of the mx8m */
>  	case MXC_CPU_MX7S:
>  		return "7S";	/* Single-core version of the mx7 */
>  	case MXC_CPU_MX7D:
> @@ -259,7 +266,7 @@ int cpu_mmc_init(bd_t *bis)
>  }
>  #endif
>  
> -#ifndef CONFIG_MX7
> +#if !(defined(CONFIG_MX7) || defined(CONFIG_MX8M))
>  u32 get_ahb_clk(void)
>  {
>  	struct mxc_ccm_reg *imx_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
> @@ -293,6 +300,7 @@ void arch_preboot_os(void)
>  #endif
>  }
>  
> +#ifndef CONFIG_MX8M
>  void set_chipselect_size(int const cs_size)
>  {
>  	unsigned int reg;
> @@ -323,3 +331,4 @@ void set_chipselect_size(int const cs_size)
>  
>  	writel(reg, &iomuxc_regs->gpr[1]);
>  }
> +#endif
> 

Reviewed-by: Stefano Babic <sbabic at denx.de>

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================


More information about the U-Boot mailing list