summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-05-01 15:38:06 +0200
committerWolfgang Denk <wd@denx.de>2009-05-01 21:24:41 +0200
commit6b2beb5626a143ca5347e7d2c6005be9936c1fbb (patch)
treeda065a2c7f6a31b816e0d62ac2465eb92be1919a /cpu
parent0ee7a310479640ef17ce2fc0f6c13cf7961d2330 (diff)
downloadu-boot-imx-6b2beb5626a143ca5347e7d2c6005be9936c1fbb.zip
u-boot-imx-6b2beb5626a143ca5347e7d2c6005be9936c1fbb.tar.gz
u-boot-imx-6b2beb5626a143ca5347e7d2c6005be9936c1fbb.tar.bz2
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>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/arm926ejs/at91/.gitignore5
-rw-r--r--cpu/arm926ejs/at91/Makefile6
-rw-r--r--cpu/arm926ejs/at91/config.mk2
-rw-r--r--cpu/arm926ejs/at91/lowlevel_init.S45
-rw-r--r--cpu/arm926ejs/at91/u-boot.lds (renamed from cpu/arm926ejs/at91/u-boot.lds.S)5
5 files changed, 2 insertions, 61 deletions
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
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)
}