vs. latest linuxppc_2_4_devel fixes walnut build

PATCH In review Cort Dougan 2 participants 2 messages Feb 10, 2003

Share & tools

Cort Dougan

author

2003-02-10 19:16 UTC #0 lore raw

PATCH 1/1 vs. latest linuxppc_2_4_devel fixes walnut build

This fixes 'make znetboot' for the walnut and ebony. There are many files in arch/ppc/boot/images/ and the * in the cp command didn't work.

It also gets rid of extra whitespace on line 245 that some versions of make don't like.

arch/ppc/boot/simple/Makefile +5 -1

diff -Nru a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
@@ -64,9 +64,13 @@
 # The rest will be unset.
 ifeq ($(CONFIG_EBONY),y)
 ZIMAGE				:= zImage-EBONY
+ZNETBOOT			:= zImage.treeboot
 ZIMAGEINITRD			:= zImage.initrd-EBONY
 TFTPIMAGE			:= /tftpboot/zImage.ebony
 endif
+ifeq ($(CONFIG_WALNUT),y)
+ZNETBOOT			:= zImage.treeboot
+endif
 ifeq ($(CONFIG_MCPN765)$(CONFIG_MVME5100)$(CONFIG_PRPMC750)$(CONFIG_PRPMC800)$(CONFIG_LOPEC)$(CONFIG_PPLUS),y)
 ZIMAGE				:= zImage-PPLUS
 ZIMAGEINITRD			:= zImage.initrd-PPLUS

@@ -241,7 +245,7 @@
 
 zImage-PAL4: zvmlinux
 	cp zvmlinux ../images/zImage.pal4
-
+
 zImage.initrd-PAL4: zvmlinux.initrd
 	cp zvmlinux.initrd ../images/zImage.initrd.pal4

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Tom Rini

2003-02-10 23:24 UTC #1 lore raw

Quoted 2 lines · Cort Dougan

This fixes 'make znetboot' for the walnut and ebony. There are many files in arch/ppc/boot/images/ and the * in the cp command didn't work.

I think the 'correct' fix (for Walnut anyhow) is to set ZNETBOOT in the CONFIG_IBM_OPENBIOS test.

But, could I talk you into letting the 'znetboot' / 'znetboot.initrd' commands die? Personally I've been using dd after a 'zImage' / 'zImage.initrd'.

--
Tom Rini
http://gate.crashing.org/~trini/

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/