patch-2.1.129 linux/arch/ppc/boot/Makefile

Next file: linux/arch/ppc/chrpboot/Makefile
Previous file: linux/arch/ppc/apus_defconfig
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.128/linux/arch/ppc/boot/Makefile linux/arch/ppc/boot/Makefile
@@ -24,15 +24,21 @@
 ZSZ = 0
 IOFF = 0
 ISZ = 0
+
+ifeq ($(CONFIG_ALL_PPC),y)
+# yes, we want to build prep stuff
+CONFIG_PREP = y
+endif
+
 ifeq ($(CONFIG_MBX),y)
 ZLINKFLAGS = -T ../vmlinux.lds -Ttext 0x00100000
 else
-#ZLINKFLAGS = -T ../vmlinux.lds -Ttext 0x00800000
 ZLINKFLAGS = -T ../vmlinux.lds -Ttext 0x00600000
 endif
+
 GZIP_FLAGS = -v9
 
-OBJECTS := head.o misc.o ../coffboot/zlib.o # inflate.o unzip.o
+OBJECTS := head.o misc.o ../coffboot/zlib.o
 CFLAGS = -O2 -DSTDC_HEADERS -fno-builtin -I$(TOPDIR)/include
 OBJCOPY = $(CROSS_COMPILE)objcopy
 OBJCOPY_ARGS = -O elf32-powerpc
@@ -46,10 +52,6 @@
 
 all:	zImage
 
-ifeq ($(CONFIG_ALL_PPC),y)
-CONFIG_PREP = y
-endif
-
 ifeq ($(CONFIG_PREP),y)
 zvmlinux.initrd: zvmlinux
 	$(LD) $(ZLINKFLAGS) -o zvmlinux.initrd.tmp $(OBJECTS)
@@ -93,14 +95,12 @@
 zImage: zvmlinux mkprep
 	./mkprep -pbp zvmlinux zImage
 else
-
 ifeq ($(CONFIG_MBX),y)
 zImage: zvmlinux
 	ln -sf zvmlinux zImage
 else
 zImage:
 endif
-
 endif
 
 ifeq ($(CONFIG_PREP),y)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov