aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2009-02-24 21:11:24 +1100
committerWolfgang Denk <wd@denx.de>2009-02-25 11:59:22 +0100
commitf5a77a09c93fe7f04c0c56f64ea436f7d318d674 (patch)
tree2a27d090ce92a0a897e203339d39cb61dd5ea181
parent75ba6d693b8f6247aa4b81323a2ee2fa28222215 (diff)
downloadu-boot-linaro-stable-f5a77a09c93fe7f04c0c56f64ea436f7d318d674.tar.gz
Moved SC520 Files (fix commit 407976185e0dda2c90e89027121a1071b9c77bfb)
Fixes commit 407976185e0dda2c90e89027121a1071b9c77bfb Signed-off-by: Graeme Russ <graeme.russ at gmail.com>
-rw-r--r--cpu/i386/Makefile3
-rw-r--r--cpu/i386/sc520/Makefile52
-rw-r--r--cpu/i386/sc520/sc520.c (renamed from cpu/i386/sc520.c)0
-rw-r--r--cpu/i386/sc520/sc520_asm.S (renamed from cpu/i386/sc520_asm.S)3
4 files changed, 53 insertions, 5 deletions
diff --git a/cpu/i386/Makefile b/cpu/i386/Makefile
index f20675af1..761c4f6fc 100644
--- a/cpu/i386/Makefile
+++ b/cpu/i386/Makefile
@@ -29,8 +29,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(CPU).a
START = start.o start16.o resetvec.o
-COBJS = serial.o interrupts.o cpu.o timer.o sc520.o
-SOBJS = sc520_asm.o
+COBJS = serial.o interrupts.o cpu.o timer.o
SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/cpu/i386/sc520/Makefile b/cpu/i386/sc520/Makefile
new file mode 100644
index 000000000..ddfec23f6
--- /dev/null
+++ b/cpu/i386/sc520/Makefile
@@ -0,0 +1,52 @@
+#
+# (C) Copyright 2008
+# Graeme Russ, graeme.russ@gmail.com.
+#
+# (C) Copyright 2006
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
+# (C) Copyright 2002
+# Daniel Engström, Omicron Ceti AB, daniel@omicron.se.
+#
+# 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 $(TOPDIR)/config.mk
+
+LIB := $(obj)lib$(SOC).a
+
+COBJS-$(CONFIG_SYS_SC520) += sc520.o
+SOBJS-$(CONFIG_SYS_SC520) += sc520_asm.o
+
+SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
+
+all: $(obj).depend $(LIB)
+
+$(LIB): $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+######################################################################### \ No newline at end of file
diff --git a/cpu/i386/sc520.c b/cpu/i386/sc520/sc520.c
index b958f8dc0..b958f8dc0 100644
--- a/cpu/i386/sc520.c
+++ b/cpu/i386/sc520/sc520.c
diff --git a/cpu/i386/sc520_asm.S b/cpu/i386/sc520/sc520_asm.S
index 59ed2b8d6..2042d9bfc 100644
--- a/cpu/i386/sc520_asm.S
+++ b/cpu/i386/sc520/sc520_asm.S
@@ -105,7 +105,6 @@
*/
#include <config.h>
-#ifdef CONFIG_SC520
.section .text
.equ DRCCTL, 0x0fffef010 /* DRAM control register */
@@ -580,5 +579,3 @@ set_ecc:
out:
movl %ebx, %eax
jmp *%ebp
-
-#endif /* CONFIG_SC520 */