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

[Stefano Babic]

On 22/09/2012 18:24, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam at freescale.com>
> 
> lowlevel_init.S is not used on mx6, so remove the file and the associated calls.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam at freescale.com>
> ---

Hi Fabio,

I am testing the -next branch. MX5 does not boot anymore - I have tested
on MX53. In fact:

> Changes since v1:
> - Also remove SOBJS
> 
>  arch/arm/cpu/armv7/mx6/Makefile        |    5 ++---
>  arch/arm/cpu/armv7/mx6/lowlevel_init.S |   25 -------------------------
>  arch/arm/cpu/armv7/start.S             |   24 ------------------------
>  3 files changed, 2 insertions(+), 52 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..10f512f 100644
> --- a/arch/arm/cpu/armv7/mx6/Makefile
> +++ b/arch/arm/cpu/armv7/mx6/Makefile
> @@ -28,10 +28,9 @@ 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))
> +SRCS	:= $(COBJS:.o=.c)
> +OBJS	:= $(addprefix $(obj), $(COBJS))
>  
>  all:	$(obj).depend $(LIB)
>  
> 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

What does happen now to the poor MX5 ? lowlevel_init is not called
anymore, I presume...

Maybe it is better to add a weak function in MX6 cpu code. This let Eric
to add a custom lowlevel_init, as he asked.

Do you agree ?

Best regards,
Stefano

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
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
=====================================================================