[U-Boot] [PATCH] mx6: Remove lowlevel_init.S

[U-Boot] [PATCH] mx6: Remove lowlevel_init.S

[Fabio Estevam]

lowlevel_init.S is not used on mx6, so remove the file and the associated calls.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/cpu/armv7/mx6/Makefile        |    1 -
 arch/arm/cpu/armv7/mx6/lowlevel_init.S |   25 -------------------------
 arch/arm/cpu/armv7/start.S             |   24 ------------------------
 3 files changed, 50 deletions(-)
 delete mode 100644 arch/arm/cpu/armv7/mx6/lowlevel_init.S

diff --git a/arch/arm/cpu/armv7/mx6/Makefile b/arch/arm/cpu/armv7/mx6/Makefile
index cbce411..4f9ca68 100644
--- a/arch/arm/cpu/armv7/mx6/Makefile
+++ b/arch/arm/cpu/armv7/mx6/Makefile
@@ -28,7 +28,6 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(SOC).o
 
 COBJS	= soc.o clock.o
-SOBJS   = lowlevel_init.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/arch/arm/cpu/armv7/mx6/lowlevel_init.S b/arch/arm/cpu/armv7/mx6/lowlevel_init.S
deleted file mode 100644
index acadef2..0000000
--- a/arch/arm/cpu/armv7/mx6/lowlevel_init.S
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-.section ".text.init", "x"
-
-#include <linux/linkage.h>
-
-ENTRY(lowlevel_init)
-	mov pc, lr
-ENDPROC(lowlevel_init)
diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index 32658eb..4c7c385 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -152,7 +152,6 @@ reset:
 	/* the mask ROM code should have PLL and others stable */
 #ifndef CONFIG_SKIP_LOWLEVEL_INIT
 	bl	cpu_init_cp15
-	bl	cpu_init_crit
 #endif
 
 /* Set stackpointer in internal RAM to call board_init_f */
@@ -353,29 +352,6 @@ ENTRY(cpu_init_cp15)
 	mov	pc, lr			@ back to my caller
 ENDPROC(cpu_init_cp15)
 
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT
-/*************************************************************************
- *
- * CPU_init_critical registers
- *
- * setup important registers
- * setup memory timing
- *
- *************************************************************************/
-ENTRY(cpu_init_crit)
-	/*
-	 * Jump to board specific initialization...
-	 * The Mask ROM will have already initialized
-	 * basic memory. Go here to bump up clock rate and handle
-	 * wake up conditions.
-	 */
-	mov	ip, lr			@ persevere link reg across call
-	bl	lowlevel_init		@ go setup pll,mux,memory
-	mov	lr, ip			@ restore link
-	mov	pc, lr			@ back to my caller
-ENDPROC(cpu_init_crit)
-#endif
-
 #ifndef CONFIG_SPL_BUILD
 /*
  *************************************************************************
-- 
1.7.9.5

[U-Boot] [PATCH] mx6: Remove lowlevel_init.S

[Dirk Behme]

On 17.09.2012 18:34, Fabio Estevam wrote:
> lowlevel_init.S is not used on mx6,

Yes, but ...

We use lowlevel_init.S on a not yet public custom board to do some 
early, custom specific initialization. So I would vote to keep this.

But most probably non-mainline code isn't a reason to keep this?

Best regards

Dirk

> so remove the file and the associated calls.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  arch/arm/cpu/armv7/mx6/Makefile        |    1 -
>  arch/arm/cpu/armv7/mx6/lowlevel_init.S |   25 -------------------------
>  arch/arm/cpu/armv7/start.S             |   24 ------------------------
>  3 files changed, 50 deletions(-)
>  delete mode 100644 arch/arm/cpu/armv7/mx6/lowlevel_init.S
> 
> diff --git a/arch/arm/cpu/armv7/mx6/Makefile b/arch/arm/cpu/armv7/mx6/Makefile
> index cbce411..4f9ca68 100644
> --- a/arch/arm/cpu/armv7/mx6/Makefile
> +++ b/arch/arm/cpu/armv7/mx6/Makefile
> @@ -28,7 +28,6 @@ include $(TOPDIR)/config.mk
>  LIB	= $(obj)lib$(SOC).o
>  
>  COBJS	= soc.o clock.o
> -SOBJS   = lowlevel_init.o
>  
>  SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
>  OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
> diff --git a/arch/arm/cpu/armv7/mx6/lowlevel_init.S b/arch/arm/cpu/armv7/mx6/lowlevel_init.S
> deleted file mode 100644
> index acadef2..0000000
> --- a/arch/arm/cpu/armv7/mx6/lowlevel_init.S
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -/*
> - * Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> - * MA 02111-1307 USA
> - */
> -.section ".text.init", "x"
> -
> -#include <linux/linkage.h>
> -
> -ENTRY(lowlevel_init)
> -	mov pc, lr
> -ENDPROC(lowlevel_init)
> diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
> index 32658eb..4c7c385 100644
> --- a/arch/arm/cpu/armv7/start.S
> +++ b/arch/arm/cpu/armv7/start.S
> @@ -152,7 +152,6 @@ reset:
>  	/* the mask ROM code should have PLL and others stable */
>  #ifndef CONFIG_SKIP_LOWLEVEL_INIT
>  	bl	cpu_init_cp15
> -	bl	cpu_init_crit
>  #endif
>  
>  /* Set stackpointer in internal RAM to call board_init_f */
> @@ -353,29 +352,6 @@ ENTRY(cpu_init_cp15)
>  	mov	pc, lr			@ back to my caller
>  ENDPROC(cpu_init_cp15)
>  
> -#ifndef CONFIG_SKIP_LOWLEVEL_INIT
> -/*************************************************************************
> - *
> - * CPU_init_critical registers
> - *
> - * setup important registers
> - * setup memory timing
> - *
> - *************************************************************************/
> -ENTRY(cpu_init_crit)
> -	/*
> -	 * Jump to board specific initialization...
> -	 * The Mask ROM will have already initialized
> -	 * basic memory. Go here to bump up clock rate and handle
> -	 * wake up conditions.
> -	 */
> -	mov	ip, lr			@ persevere link reg across call
> -	bl	lowlevel_init		@ go setup pll,mux,memory
> -	mov	lr, ip			@ restore link
> -	mov	pc, lr			@ back to my caller
> -ENDPROC(cpu_init_crit)
> -#endif
> -
>  #ifndef CONFIG_SPL_BUILD
>  /*
>   *************************************************************************

[U-Boot] [PATCH] mx6: Remove lowlevel_init.S

[Fabio Estevam]

Hi Dirk,

On Tue, Sep 18, 2012 at 5:02 AM, Dirk Behme <dirk.behme@de.bosch.com> wrote:
> On 17.09.2012 18:34, Fabio Estevam wrote:
>>
>> lowlevel_init.S is not used on mx6,
>
>
> Yes, but ...
>
> We use lowlevel_init.S on a not yet public custom board to do some early,
> custom specific initialization. So I would vote to keep this.

arch/arm/cpu/armv7/mx6/lowlevel_init.S is meant to contain code that
is common to all mx6 boards. If you need some specific initialization
for your board, I would suggest you to add such code into a C board
file, or at least at board/<vendor>/<board_name>/lowlevel_init.S
instead.

Regards,

Fabio Estevam