
Hi Fabio,
On Saturday, September 29, 2012 9:31:07 PM, Fabio Estevam wrote:
Hi Stefano/Benoît,
On Fri, Sep 28, 2012 at 5:30 AM, Stefano Babic sbabic@denx.de wrote:
I am testing the -next branch. MX5 does not boot anymore - I have tested on MX53. In fact:
Sorry for the breakage, the correct patch would be:
arch/arm/cpu/armv7/mx6/Makefile | 3 +-- arch/arm/cpu/armv7/mx6/lowlevel_init.S | 25
2 files changed, 1 insertion(+), 27 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..deddcc3 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)
You forgot the following lines from your v2: -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +SRCS := $(COBJS:.o=.c)
-OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) +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)
1.7.9.5
Please drop my original patch from your next tree and then I can send this modified version.
Also, can link succeed for i.MX6 with this patch? Isn't there something missing? I mean: lowlevel_init() is still called but no longer defined, so shouldn't the following be added to armv7's start.S?
ENTRY(lowlevel_init) bx lr @ back to my caller ENDPROC(lowlevel_init) .weak lowlevel_init
Best regards, Benoît