[PATCH] powerpc: Fix mismerge of iss4xx platform support

STALE6448d

2 messages, 1 author, 2008-12-08 · open the first message on its own page

[PATCH] powerpc: Fix mismerge of iss4xx platform support

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2008-12-08 04:32:26 

The Makefile missed the necessary bit for treeboot-iss4xx.o to be built
thus breaking builds of this platform

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

 arch/powerpc/boot/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-work.orig/arch/powerpc/boot/Makefile	2008-12-08 15:30:38.000000000 +1100
+++ linux-work/arch/powerpc/boot/Makefile	2008-12-08 15:30:56.000000000 +1100
@@ -70,7 +70,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82
 		cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
 		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
 		virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
-		cuboot-acadia.c
+		cuboot-acadia.c treeboot-iss4xx.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))

Re: [PATCH] powerpc: Fix mismerge of iss4xx platform support

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2008-12-08 04:37:26 

On Mon, 2008-12-08 at 15:32 +1100, Benjamin Herrenschmidt wrote:
The Makefile missed the necessary bit for treeboot-iss4xx.o to be built
thus breaking builds of this platform

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
Ignore patch, my mistake :-)

Cheers,
Ben.
quoted hunk
 arch/powerpc/boot/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-work.orig/arch/powerpc/boot/Makefile	2008-12-08 15:30:38.000000000 +1100
+++ linux-work/arch/powerpc/boot/Makefile	2008-12-08 15:30:56.000000000 +1100
@@ -70,7 +70,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82
 		cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
 		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
 		virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
-		cuboot-acadia.c
+		cuboot-acadia.c treeboot-iss4xx.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help