Patchwork powerpc: Fix mismerge of iss4xx platform support

login
register
mail settings
Submitter Benjamin Herrenschmidt
Date Dec. 8, 2008, 4:32 a.m.
Message ID <20081208043311.5CB96DDE07@ozlabs.org>
Download mbox | patch
Permalink /patch/12676/
State Not Applicable
Headers show

Comments

Benjamin Herrenschmidt - Dec. 8, 2008, 4:32 a.m.
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(-)
Benjamin Herrenschmidt - Dec. 8, 2008, 4:37 a.m.
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.

>  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

Patch

--- 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))