actually no boards use the default lowlevel_init.S so remove it
btw the u-boot.lds is not anymore need to be generated
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- Makefile | 1 - cpu/arm926ejs/at91/.gitignore | 5 --- cpu/arm926ejs/at91/Makefile | 6 +--- cpu/arm926ejs/at91/config.mk | 2 +- cpu/arm926ejs/at91/lowlevel_init.S | 45 ----------------------- cpu/arm926ejs/at91/{u-boot.lds.S => u-boot.lds} | 5 --- 6 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 cpu/arm926ejs/at91/.gitignore delete mode 100644 cpu/arm926ejs/at91/lowlevel_init.S rename cpu/arm926ejs/at91/{u-boot.lds.S => u-boot.lds} (93%)
diff --git a/Makefile b/Makefile index c52894c..8a0784c 100644 --- a/Makefile +++ b/Makefile @@ -3523,7 +3523,6 @@ clean: $(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} diff --git a/cpu/arm926ejs/at91/.gitignore b/cpu/arm926ejs/at91/.gitignore deleted file mode 100644 index 8a8c3b8..0000000 --- a/cpu/arm926ejs/at91/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# -# Generated files -# - -/u-boot.lds diff --git a/cpu/arm926ejs/at91/Makefile b/cpu/arm926ejs/at91/Makefile index fbc82d1..e300d97 100644 --- a/cpu/arm926ejs/at91/Makefile +++ b/cpu/arm926ejs/at91/Makefile @@ -58,19 +58,15 @@ COBJS-$(CONFIG_AT91_LED) += led.o 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 $^ > $@ - #########################################################################
# defines $(obj).depend target diff --git a/cpu/arm926ejs/at91/config.mk b/cpu/arm926ejs/at91/config.mk index 147bd4c..06177e6 100644 --- a/cpu/arm926ejs/at91/config.mk +++ b/cpu/arm926ejs/at91/config.mk @@ -1,2 +1,2 @@ PLATFORM_CPPFLAGS += $(call cc-option,-mtune=arm926ejs,) -LDSCRIPT := $(OBJTREE)/cpu/arm926ejs/at91/u-boot.lds +LDSCRIPT := $(SRCTREE)/cpu/arm926ejs/at91/u-boot.lds diff --git a/cpu/arm926ejs/at91/lowlevel_init.S b/cpu/arm926ejs/at91/lowlevel_init.S deleted file mode 100644 index 54b3f3d..0000000 --- a/cpu/arm926ejs/at91/lowlevel_init.S +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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 */ diff --git a/cpu/arm926ejs/at91/u-boot.lds.S b/cpu/arm926ejs/at91/u-boot.lds similarity index 93% rename from cpu/arm926ejs/at91/u-boot.lds.S rename to cpu/arm926ejs/at91/u-boot.lds index 4e82bca..62a3e95 100644 --- a/cpu/arm926ejs/at91/u-boot.lds.S +++ b/cpu/arm926ejs/at91/u-boot.lds @@ -21,8 +21,6 @@ * 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) @@ -35,9 +33,6 @@ SECTIONS .text : { cpu/arm926ejs/start.o (.text) -#ifndef CONFIG_SKIP_LOWLEVEL_INIT - board/CONFIG_BOARDDIR/lowlevel_init.o (.text) -#endif *(.text) }