summaryrefslogtreecommitdiffstats
path: root/arch/ppc/chrpboot
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-01-31 22:22:27 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-01-31 22:22:27 +0000
commit825423e4c4f18289df2393951cfd2a7a31fc0464 (patch)
tree4ad80e981c3d9effa910d2247d118d254f9a5d09 /arch/ppc/chrpboot
parentc4693dc4856ab907a5c02187a8d398861bebfc7e (diff)
Merge with Linux 2.4.1.
Diffstat (limited to 'arch/ppc/chrpboot')
-rw-r--r--arch/ppc/chrpboot/Makefile10
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/ppc/chrpboot/Makefile b/arch/ppc/chrpboot/Makefile
index f7ea3a3fa..9dbb7909d 100644
--- a/arch/ppc/chrpboot/Makefile
+++ b/arch/ppc/chrpboot/Makefile
@@ -23,11 +23,6 @@ LD_ARGS = -Ttext 0x00400000
OBJS = crt0.o start.o main.o misc.o ../coffboot/string.o ../coffboot/zlib.o image.o
LIBS = $(TOPDIR)/lib/lib.a
-ifeq ($(CONFIG_ALL_PPC),y)
-# yes, we want to build chrp stuff
-CONFIG_CHRP = y
-endif
-
ifeq ($(CONFIG_SMP),y)
TFTPIMAGE=/tftpboot/zImage.chrp.smp$(MSIZE)
else
@@ -37,10 +32,10 @@ endif
all: $(TOPDIR)/zImage
#
-# Only build anything here if we're configured for CHRP
+# Only build anything here if we're configured for ALL_PPC
# -- cort
#
-ifeq ($(CONFIG_CHRP),y)
+ifeq ($(CONFIG_ALL_PPC),y)
znetboot: zImage
cp zImage $(TFTPIMAGE)
@@ -96,6 +91,7 @@ vmlinux.coff.initrd:
clean:
rm -f piggyback note addnote $(OBJS) zImage
+ rm -f zImage.rs6k zImage.initrd zImage.initrd.rs6k
fastdep:
$(TOPDIR)/scripts/mkdep *.[Sch] > .depend