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>
This commit is contained in:
parent
0ee7a31047
commit
6b2beb5626
1
Makefile
1
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}
|
||||
|
|
5
cpu/arm926ejs/at91/.gitignore
vendored
5
cpu/arm926ejs/at91/.gitignore
vendored
|
@ -1,5 +0,0 @@
|
|||
#
|
||||
# Generated files
|
||||
#
|
||||
|
||||
/u-boot.lds
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 */
|
|
@ -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)
|
||||
}
|
||||
|
Loading…
Reference in a new issue