at91: remove lowlevel_init.S

lowlevel_init.S is not used any more so remove it. As consequence, we also don't have to generate u-boot.lds but can use a static version as before. This also fixes the out-of-tree build problem introduced with commit f0a2c7b4 "at91: add support for the PM9263 board" Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Wolfgang Denk <wd@denx.de>

at91: remove lowlevel_init.S
lowlevel_init.S is not used any more so remove it. As consequence, we also don't have to generate u-boot.lds but can use a static version as before. This also fixes the out-of-tree build problem introduced with commit f0a2c7b4 "at91: add support for the PM9263 board" Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
Jean-Christophe PLAGNIOL-VILLARD · Wolfgang Denk
1 parent 0ee7a31047
Showing 7 changed files with 59 additions and 119 deletions Side-by-side Diff
Makefile
cpu/arm926ejs/at91/.gitignore
cpu/arm926ejs/at91/Makefile
cpu/arm926ejs/at91/config.mk
cpu/arm926ejs/at91/lowlevel_init.S
cpu/arm926ejs/at91/u-boot.lds
cpu/arm926ejs/at91/u-boot.lds.S
@@ -3523,7 +3523,6 @@
 	       $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds  \
 	       $(obj)board/bf5{18f,26,27,33,38f,48,61}-ez{brd,kit}/u-boot.lds \
 	       $(obj)board/bf5{33,37}-stamp/u-boot.lds			  \
-	       $(obj)cpu/arm926ejs/at91/u-boot.lds			  \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h
 	@rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map}
-#
-# Generated files
-#
-
-/u-boot.lds
@@ -58,18 +58,14 @@
 COBJS-y += clock.o
 COBJS-y += cpu.o
 COBJS-y	+= timer.o
-SOBJS	= lowlevel_init.o
  
 SRCS    := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
 OBJS    := $(addprefix $(obj),$(SOBJS) $(COBJS-y))
  
-all:	$(obj).depend $(LIB) $(obj)u-boot.lds
+all:	$(obj).depend $(LIB)
  
 $(LIB):	$(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS)
-
-$(obj)u-boot.lds: u-boot.lds.S
-	$(CPP) $(CPPFLAGS) -D__ASSEMBLY__ -DCONFIG_BOARDDIR=$(BOARDDIR) -P $^ > $@
  
 #########################################################################
  
 PLATFORM_CPPFLAGS += $(call cc-option,-mtune=arm926ejs,)
-LDSCRIPT := $(OBJTREE)/cpu/arm926ejs/at91/u-boot.lds
+LDSCRIPT := $(SRCTREE)/cpu/arm926ejs/at91/u-boot.lds
-/*
- * AT91CAP9/SAM9 setup stuff
- *
- * (C) Copyright 2007-2008
- * Stelian Pop <stelian.pop@leadtechdesign.com>
- * Lead Tech Design <www.leadtechdesign.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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
- */
-
-#include <config.h>
-#include <version.h>
-
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT
-
-.globl lowlevel_init
-.weak lowlevel_init
-.set lowlevel_init,function
-lowlevel_init:
-
-	/*
-	 * Clocks/SDRAM initialization is handled by at91bootstrap,
-	 * no need to do it here...
-	 */
-	mov	pc, lr
-
-	.ltorg
-
-#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
+/*
+ * (C) Copyright 2002
+ * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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
+ */
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+/*OUTPUT_FORMAT("elf32-arm", "elf32-arm", "elf32-arm")*/
+OUTPUT_ARCH(arm)
+ENTRY(_start)
+SECTIONS
+{
+	. = 0x00000000;
+
+	. = ALIGN(4);
+	.text :
+	{
+		cpu/arm926ejs/start.o	(.text)
+		*(.text)
+	}
+
+	. = ALIGN(4);
+	.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
+
+	. = ALIGN(4);
+	.data : { *(.data) }
+
+	. = ALIGN(4);
+	.got : { *(.got) }
+
+	. = .;
+	__u_boot_cmd_start = .;
+	.u_boot_cmd : { *(.u_boot_cmd) }
+	__u_boot_cmd_end = .;
+
+	. = ALIGN(4);
+	__bss_start = .;
+	.bss : { *(.bss) . = ALIGN(4); }
+	_end = .;
+}
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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
- */
-
-#include <config.h>
-
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-/*OUTPUT_FORMAT("elf32-arm", "elf32-arm", "elf32-arm")*/
-OUTPUT_ARCH(arm)
-ENTRY(_start)
-SECTIONS
-{
-	. = 0x00000000;
-
-	. = ALIGN(4);
-	.text :
-	{
-		cpu/arm926ejs/start.o	(.text)
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT
-		board/CONFIG_BOARDDIR/lowlevel_init.o (.text)
-#endif
-		*(.text)
-	}
-
-	. = ALIGN(4);
-	.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
-
-	. = ALIGN(4);
-	.data : { *(.data) }
-
-	. = ALIGN(4);
-	.got : { *(.got) }
-
-	. = .;
-	__u_boot_cmd_start = .;
-	.u_boot_cmd : { *(.u_boot_cmd) }
-	__u_boot_cmd_end = .;
-
-	. = ALIGN(4);
-	__bss_start = .;
-	.bss : { *(.bss) . = ALIGN(4); }
-	_end = .;
-}
...	...	@@ -3523,7 +3523,6 @@
3523	3523	$(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds \
3524	3524	$(obj)board/bf5{18f,26,27,33,38f,48,61}-ez{brd,kit}/u-boot.lds \
3525	3525	$(obj)board/bf5{33,37}-stamp/u-boot.lds \
3526		- $(obj)cpu/arm926ejs/at91/u-boot.lds \
3527	3526	$(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
3528	3527	@rm -f $(obj)include/bmp_logo.h
3529	3528	@rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map}
...	...	@@ -58,18 +58,14 @@
58	58	COBJS-y += clock.o
59	59	COBJS-y += cpu.o
60	60	COBJS-y += timer.o
61		-SOBJS = lowlevel_init.o
62	61
63	62	SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
64	63	OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS-y))
65	64
66		-all: $(obj).depend $(LIB) $(obj)u-boot.lds
	65	+all: $(obj).depend $(LIB)
67	66
68	67	$(LIB): $(OBJS)
69	68	$(AR) $(ARFLAGS) $@ $(OBJS)
70		-
71		-$(obj)u-boot.lds: u-boot.lds.S
72		- $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ -DCONFIG_BOARDDIR=$(BOARDDIR) -P $^ > $@
73	69
74	70	#########################################################################
75	71
1	1	PLATFORM_CPPFLAGS += $(call cc-option,-mtune=arm926ejs,)
2		-LDSCRIPT := $(OBJTREE)/cpu/arm926ejs/at91/u-boot.lds
	2	+LDSCRIPT := $(SRCTREE)/cpu/arm926ejs/at91/u-boot.lds
1		-/*
2		- * AT91CAP9/SAM9 setup stuff
3		- *
4		- * (C) Copyright 2007-2008
5		- * Stelian Pop <stelian.pop@leadtechdesign.com>
6		- * Lead Tech Design <www.leadtechdesign.com>
7		- *
8		- * See file CREDITS for list of people who contributed to this
9		- * project.
10		- *
11		- * This program is free software; you can redistribute it and/or
12		- * modify it under the terms of the GNU General Public License as
13		- * published by the Free Software Foundation; either version 2 of
14		- * the License, or (at your option) any later version.
15		- *
16		- * This program is distributed in the hope that it will be useful,
17		- * but WITHOUT ANY WARRANTY; without even the implied warranty of
18		- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19		- * GNU General Public License for more details.
20		- *
21		- * You should have received a copy of the GNU General Public License
22		- * along with this program; if not, write to the Free Software
23		- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
24		- * MA 02111-1307 USA
25		- */
26		-
27		-#include <config.h>
28		-#include <version.h>
29		-
30		-#ifndef CONFIG_SKIP_LOWLEVEL_INIT
31		-
32		-.globl lowlevel_init
33		-.weak lowlevel_init
34		-.set lowlevel_init,function
35		-lowlevel_init:
36		-
37		- /*
38		- * Clocks/SDRAM initialization is handled by at91bootstrap,
39		- * no need to do it here...
40		- */
41		- mov pc, lr
42		-
43		- .ltorg
44		-
45		-#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
	1	+/*
	2	+ * (C) Copyright 2002
	3	+ * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
	4	+ *
	5	+ * See file CREDITS for list of people who contributed to this
	6	+ * project.
	7	+ *
	8	+ * This program is free software; you can redistribute it and/or
	9	+ * modify it under the terms of the GNU General Public License as
	10	+ * published by the Free Software Foundation; either version 2 of
	11	+ * the License, or (at your option) any later version.
	12	+ *
	13	+ * This program is distributed in the hope that it will be useful,
	14	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	15	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	16	+ * GNU General Public License for more details.
	17	+ *
	18	+ * You should have received a copy of the GNU General Public License
	19	+ * along with this program; if not, write to the Free Software
	20	+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
	21	+ * MA 02111-1307 USA
	22	+ */
	23	+
	24	+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
	25	+/OUTPUT_FORMAT("elf32-arm", "elf32-arm", "elf32-arm")/
	26	+OUTPUT_ARCH(arm)
	27	+ENTRY(_start)
	28	+SECTIONS
	29	+{
	30	+ . = 0x00000000;
	31	+
	32	+ . = ALIGN(4);
	33	+ .text :
	34	+ {
	35	+ cpu/arm926ejs/start.o (.text)
	36	+ *(.text)
	37	+ }
	38	+
	39	+ . = ALIGN(4);
	40	+ .rodata : { (SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata))) }
	41	+
	42	+ . = ALIGN(4);
	43	+ .data : { *(.data) }
	44	+
	45	+ . = ALIGN(4);
	46	+ .got : { *(.got) }
	47	+
	48	+ . = .;
	49	+ __u_boot_cmd_start = .;
	50	+ .u_boot_cmd : { *(.u_boot_cmd) }
	51	+ __u_boot_cmd_end = .;
	52	+
	53	+ . = ALIGN(4);
	54	+ __bss_start = .;
	55	+ .bss : { *(.bss) . = ALIGN(4); }
	56	+ _end = .;
	57	+}
1		-/*
2		- * (C) Copyright 2002
3		- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
4		- *
5		- * See file CREDITS for list of people who contributed to this
6		- * project.
7		- *
8		- * This program is free software; you can redistribute it and/or
9		- * modify it under the terms of the GNU General Public License as
10		- * published by the Free Software Foundation; either version 2 of
11		- * the License, or (at your option) any later version.
12		- *
13		- * This program is distributed in the hope that it will be useful,
14		- * but WITHOUT ANY WARRANTY; without even the implied warranty of
15		- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16		- * GNU General Public License for more details.
17		- *
18		- * You should have received a copy of the GNU General Public License
19		- * along with this program; if not, write to the Free Software
20		- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
21		- * MA 02111-1307 USA
22		- */
23		-
24		-#include <config.h>
25		-
26		-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
27		-/OUTPUT_FORMAT("elf32-arm", "elf32-arm", "elf32-arm")/
28		-OUTPUT_ARCH(arm)
29		-ENTRY(_start)
30		-SECTIONS
31		-{
32		- . = 0x00000000;
33		-
34		- . = ALIGN(4);
35		- .text :
36		- {
37		- cpu/arm926ejs/start.o (.text)
38		-#ifndef CONFIG_SKIP_LOWLEVEL_INIT
39		- board/CONFIG_BOARDDIR/lowlevel_init.o (.text)
40		-#endif
41		- *(.text)
42		- }
43		-
44		- . = ALIGN(4);
45		- .rodata : { (SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata))) }
46		-
47		- . = ALIGN(4);
48		- .data : { *(.data) }
49		-
50		- . = ALIGN(4);
51		- .got : { *(.got) }
52		-
53		- . = .;
54		- __u_boot_cmd_start = .;
55		- .u_boot_cmd : { *(.u_boot_cmd) }
56		- __u_boot_cmd_end = .;
57		-
58		- . = ALIGN(4);
59		- __bss_start = .;
60		- .bss : { *(.bss) . = ALIGN(4); }
61		- _end = .;
62		-}