public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 1/7] Moved SC520 Files (fix commit 407976185e0dda2c90e89027121a1071b9c77bfb)
@ 2009-02-24 10:11 Graeme Russ
  2009-02-24 22:27 ` Wolfgang Denk
  0 siblings, 1 reply; 4+ messages in thread
From: Graeme Russ @ 2009-02-24 10:11 UTC (permalink / raw)
  To: u-boot

Fixes commit 407976185e0dda2c90e89027121a1071b9c77bfb	

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
---
For some reason, the following patch posted on the mailing list did not apply
completely:
[PATCH 04/15] Moved sc520 specific code into new cpu/i386/sc520 folder
---
 cpu/i386/Makefile          |    3 +--
 cpu/i386/sc520/Makefile    |   52 ++++++++++++++++++++++++++++++++++++++++++++
 cpu/i386/sc520/sc520.c     |    0 
 cpu/i386/sc520/sc520_asm.S |    3 ---
 4 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 cpu/i386/sc520/Makefile
 rename cpu/i386/{sc520.c => sc520/sc520.c} (100%)
 rename cpu/i386/{sc520_asm.S => sc520/sc520_asm.S} (99%)

diff --git a/cpu/i386/Makefile b/cpu/i386/Makefile
index f20675a..761c4f6 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 0000000..ddfec23
--- /dev/null
+++ b/cpu/i386/sc520/Makefile
@@ -0,0 +1,52 @@
+#
+# (C) Copyright 2008
+# Graeme Russ, graeme.russ at gmail.com.
+#
+# (C) Copyright 2006
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# (C) Copyright 2002
+# Daniel Engstr?m, Omicron Ceti AB, daniel at 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
similarity index 100%
rename from cpu/i386/sc520.c
rename to cpu/i386/sc520/sc520.c
diff --git a/cpu/i386/sc520_asm.S b/cpu/i386/sc520/sc520_asm.S
similarity index 99%
rename from cpu/i386/sc520_asm.S
rename to cpu/i386/sc520/sc520_asm.S
index 59ed2b8..2042d9b 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 */

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-02-25 11:01 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-24 10:11 [U-Boot] [PATCH 1/7] Moved SC520 Files (fix commit 407976185e0dda2c90e89027121a1071b9c77bfb) Graeme Russ
2009-02-24 22:27 ` Wolfgang Denk
2009-02-25 10:18   ` Graeme Russ
2009-02-25 11:01     ` Wolfgang Denk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox