Patchwork [U-Boot,3/3] ARM: mx28: Remove CONFIG_ARCH_CPU_INIT

login
register
mail settings
Submitter Fabio Estevam
Date March 1, 2012, 2:02 p.m.
Message ID <1330610560-15978-3-git-send-email-fabio.estevam@freescale.com>
Download mbox | patch
Permalink /patch/144018/
State Accepted
Commit c27c07b86b0a9ff71e3c4788d74cee50c7ed2283
Delegated to: Albert ARIBAUD
Headers show

Comments

Fabio Estevam - March 1, 2012, 2:02 p.m.
No need to define CONFIG_ARCH_CPU_INIT.

All mx28 based boards should use arch_cpu_init().

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/cpu/arm926ejs/mx28/mx28.c |    2 --
 include/configs/m28evk.h           |    1 -
 include/configs/mx28evk.h          |    1 -
 3 files changed, 0 insertions(+), 4 deletions(-)
Marek Vasut - March 1, 2012, 6:31 p.m.
> No need to define CONFIG_ARCH_CPU_INIT.
> 
> All mx28 based boards should use arch_cpu_init().
> 

Acked-by: Marek Vasut <marex@denx.de>

> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  arch/arm/cpu/arm926ejs/mx28/mx28.c |    2 --
>  include/configs/m28evk.h           |    1 -
>  include/configs/mx28evk.h          |    1 -
>  3 files changed, 0 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28.c
> b/arch/arm/cpu/arm926ejs/mx28/mx28.c index b235091..f98e6a3 100644
> --- a/arch/arm/cpu/arm926ejs/mx28/mx28.c
> +++ b/arch/arm/cpu/arm926ejs/mx28/mx28.c
> @@ -135,7 +135,6 @@ int arch_misc_init(void)
>  }
>  #endif
> 
> -#ifdef	CONFIG_ARCH_CPU_INIT
>  int arch_cpu_init(void)
>  {
>  	struct mx28_clkctrl_regs *clkctrl_regs =
> @@ -164,7 +163,6 @@ int arch_cpu_init(void)
> 
>  	return 0;
>  }
> -#endif
> 
>  #if defined(CONFIG_DISPLAY_CPUINFO)
>  int print_cpuinfo(void)
> diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
> index 4d59153..31aaf47 100644
> --- a/include/configs/m28evk.h
> +++ b/include/configs/m28evk.h
> @@ -40,7 +40,6 @@
>  #define	CONFIG_SYS_ICACHE_OFF
>  #define	CONFIG_SYS_DCACHE_OFF
>  #define	CONFIG_BOARD_EARLY_INIT_F
> -#define	CONFIG_ARCH_CPU_INIT
>  #define	CONFIG_ARCH_MISC_INIT
> 
>  /*
> diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
> index 04967d7..92903da 100644
> --- a/include/configs/mx28evk.h
> +++ b/include/configs/mx28evk.h
> @@ -34,7 +34,6 @@
>  #define CONFIG_SYS_ICACHE_OFF
>  #define CONFIG_SYS_DCACHE_OFF
>  #define CONFIG_BOARD_EARLY_INIT_F
> -#define CONFIG_ARCH_CPU_INIT
>  #define CONFIG_ARCH_MISC_INIT
> 
>  /*
Albert ARIBAUD - July 7, 2012, 11:31 a.m.
Hi Fabio,

On Thu, 1 Mar 2012 19:31:54 +0100, Marek Vasut <marex@denx.de> wrote:

> > No need to define CONFIG_ARCH_CPU_INIT.
> > 
> > All mx28 based boards should use arch_cpu_init().
> > 
> 
> Acked-by: Marek Vasut <marex@denx.de>
> 
> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> > ---

Applied to ub-boot-arm/master, thanks.

Amicalement,
Marek Vasut - July 19, 2012, 5:28 p.m.
Dear Albert ARIBAUD,

> Hi Fabio,
> 
> On Thu, 1 Mar 2012 19:31:54 +0100, Marek Vasut <marex@denx.de> wrote:
> > > No need to define CONFIG_ARCH_CPU_INIT.
> > > 
> > > All mx28 based boards should use arch_cpu_init().
> > 
> > Acked-by: Marek Vasut <marex@denx.de>
> > 
> > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> > > ---
> 
> Applied to ub-boot-arm/master, thanks.

Did you also apply 1/3 ? If not, everything will be broken now (at least mx28 
doesn't boot without 1/3 applied as well).

> Amicalement,

Best regards,
Marek Vasut

Patch

diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28.c b/arch/arm/cpu/arm926ejs/mx28/mx28.c
index b235091..f98e6a3 100644
--- a/arch/arm/cpu/arm926ejs/mx28/mx28.c
+++ b/arch/arm/cpu/arm926ejs/mx28/mx28.c
@@ -135,7 +135,6 @@  int arch_misc_init(void)
 }
 #endif
 
-#ifdef	CONFIG_ARCH_CPU_INIT
 int arch_cpu_init(void)
 {
 	struct mx28_clkctrl_regs *clkctrl_regs =
@@ -164,7 +163,6 @@  int arch_cpu_init(void)
 
 	return 0;
 }
-#endif
 
 #if defined(CONFIG_DISPLAY_CPUINFO)
 int print_cpuinfo(void)
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 4d59153..31aaf47 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -40,7 +40,6 @@ 
 #define	CONFIG_SYS_ICACHE_OFF
 #define	CONFIG_SYS_DCACHE_OFF
 #define	CONFIG_BOARD_EARLY_INIT_F
-#define	CONFIG_ARCH_CPU_INIT
 #define	CONFIG_ARCH_MISC_INIT
 
 /*
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 04967d7..92903da 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -34,7 +34,6 @@ 
 #define CONFIG_SYS_ICACHE_OFF
 #define CONFIG_SYS_DCACHE_OFF
 #define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_ARCH_CPU_INIT
 #define CONFIG_ARCH_MISC_INIT
 
 /*