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

login
register
mail settings
Submitter Fabio Estevam
Date March 1, 2012, 2:02 p.m.
Message ID <1330610560-15978-2-git-send-email-fabio.estevam@freescale.com>
Download mbox | patch
Permalink /patch/144017/
State Accepted
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 mx6 based boards should use arch_cpu_init().

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/cpu/armv7/mx6/soc.c    |    2 --
 include/configs/mx6qarm2.h      |    1 -
 include/configs/mx6qsabrelite.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 mx6 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/armv7/mx6/soc.c    |    2 --
>  include/configs/mx6qarm2.h      |    1 -
>  include/configs/mx6qsabrelite.h |    1 -
>  3 files changed, 0 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
> index 2ac74b5..2d07099 100644
> --- a/arch/arm/cpu/armv7/mx6/soc.c
> +++ b/arch/arm/cpu/armv7/mx6/soc.c
> @@ -37,7 +37,6 @@ u32 get_cpu_rev(void)
>  	return system_rev;
>  }
> 
> -#ifdef CONFIG_ARCH_CPU_INIT
>  void init_aips(void)
>  {
>  	struct aipstz_regs *aips1, *aips2;
> @@ -77,7 +76,6 @@ int arch_cpu_init(void)
> 
>  	return 0;
>  }
> -#endif
> 
>  #if defined(CONFIG_FEC_MXC)
>  void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
> diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
> index 0962d3c..87ff0a3 100644
> --- a/include/configs/mx6qarm2.h
> +++ b/include/configs/mx6qarm2.h
> @@ -37,7 +37,6 @@
>  /* Size of malloc() pool */
>  #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 2 * 1024 * 
1024)
> 
> -#define CONFIG_ARCH_CPU_INIT
>  #define CONFIG_BOARD_EARLY_INIT_F
>  #define CONFIG_MXC_GPIO
> 
> diff --git a/include/configs/mx6qsabrelite.h
> b/include/configs/mx6qsabrelite.h index 93000f0..85e6570 100644
> --- a/include/configs/mx6qsabrelite.h
> +++ b/include/configs/mx6qsabrelite.h
> @@ -37,7 +37,6 @@
>  /* Size of malloc() pool */
>  #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
> 
> -#define CONFIG_ARCH_CPU_INIT
>  #define CONFIG_BOARD_EARLY_INIT_F
>  #define CONFIG_MXC_GPIO
Albert ARIBAUD - July 7, 2012, 11:25 a.m.
Hi Fabio,

Le Thu, 1 Mar 2012 19:31:45 +0100,
Marek Vasut <marex@denx.de> a écrit :

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

Applied (rebased) to u-boot-arm/master, thanks.

Amicalement,

Patch

diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index 2ac74b5..2d07099 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -37,7 +37,6 @@  u32 get_cpu_rev(void)
 	return system_rev;
 }
 
-#ifdef CONFIG_ARCH_CPU_INIT
 void init_aips(void)
 {
 	struct aipstz_regs *aips1, *aips2;
@@ -77,7 +76,6 @@  int arch_cpu_init(void)
 
 	return 0;
 }
-#endif
 
 #if defined(CONFIG_FEC_MXC)
 void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 0962d3c..87ff0a3 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -37,7 +37,6 @@ 
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 2 * 1024 * 1024)
 
-#define CONFIG_ARCH_CPU_INIT
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MXC_GPIO
 
diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h
index 93000f0..85e6570 100644
--- a/include/configs/mx6qsabrelite.h
+++ b/include/configs/mx6qsabrelite.h
@@ -37,7 +37,6 @@ 
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
 
-#define CONFIG_ARCH_CPU_INIT
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MXC_GPIO