Moved SC520 Files (fix commit 407976185e0dda2c90e89027121a1071b9c77bfb)
PATCH 1/7 Moved SC520 Files (fix commit 407976185e0dda2c90e89027121a1071b9c77bfb)
Fixes commit 407976185e0dda2c90e89027121a1071b9c77bfb
---
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%)cpu/i386/Makefile +1 -2
@@ -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))
cpu/i386/sc520/Makefile new file +52 -0
53 lines not on this page · raw message
cpu/i386/sc520/sc520.c renamed from cpu/i386/sc520.c +0 -0
cpu/i386/sc520/sc520_asm.S renamed from cpu/i386/sc520_asm.S +0 -3
@@ -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 */
Wolfgang Denk
AppliedPATCH 1/7 Moved SC520 Files (fix commit 407976185e0dda2c90e89027121a1071b9c77bfb)
Dear Graeme Russ,
Quoted 15 lines · In message <[email protected]> you wrote:
Fixes commit
407976185e0dda2c90e89027121a1071b9c77bfb=Signed-off-by Graeme Russ <[email protected]>---
For some reason, the following patch posted on the mailing list did not app= ly
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 =
Quoted 5 lines
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 =3D> sc520/sc520.c} (100%)
rename cpu/i386/{sc520_asm.S =3D> sc520/sc520_asm.S} (99%)Applied to "next" branch. Thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "Well I don't see why I have to make one man miserable when I can make so many men happy." - Ellyn Mustard, about marriage
PATCH 1/7 Moved SC520 Files (fix commit 407976185e0dda2c90e89027121a1071b9c77bfb)
Quoted 6 lines · Wolfgang Denk
Dear Graeme Russ,
Quoted 2 lines · In message <[email protected]> you wrote:
Fixes commit
407976185e0dda2c90e89027121a1071b9c77bfb=
Quoted 7 lines
Quoted 4 lines
4 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 cpu/i386/sc520/Makefile rename cpu/i386/{sc520.c =3D> sc520/sc520.c} (100%) rename cpu/i386/{sc520_asm.S =3D> sc520/sc520_asm.S} (99%)Applied to "next" branch. Thanks.
Wolfgang,
Can this one be applied to master considering in fixes a broken build?
Regards,
Graeme
PATCH 1/7 Moved SC520 Files (fix commit 407976185e0dda2c90e89027121a1071b9c77bfb)
Dear Graeme Russ,
Quoted 12 lines · In message <[email protected]> you…
Quoted 11 lines · Wolfgang Denk
Dear Graeme Russ,
Quoted 7 lines · In message <[email protected]> you wrote:
Fixes commit
407976185e0dda2c90e89027121a1071b9c77bfb=4 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 cpu/i386/sc520/Makefile rename cpu/i386/{sc520.c =3D> sc520/sc520.c} (100%) rename cpu/i386/{sc520_asm.S =3D> sc520/sc520_asm.S} (99%)
Quoted 6 lines
Quoted 2 lines
Applied to "next" branch. Thanks.
Wolfgang,
Can this one be applied to master considering in fixes a broken build?
Sure. Done.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Above all else -- sky.