summaryrefslogtreecommitdiffstats
path: root/arch/ppc/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
commitdb7d4daea91e105e3859cf461d7e53b9b77454b2 (patch)
tree9bb65b95440af09e8aca63abe56970dd3360cc57 /arch/ppc/Makefile
parent9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff)
Merge with Linux 2.2.8.
Diffstat (limited to 'arch/ppc/Makefile')
-rw-r--r--arch/ppc/Makefile9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 990b24b84..d865053c4 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -45,6 +45,7 @@ endif
MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
MAKECOFFBOOT = $(MAKE) -C arch/$(ARCH)/coffboot
MAKECHRPBOOT = $(MAKE) -C arch/$(ARCH)/chrpboot
+MAKEMBXBOOT = $(MAKE) -C arch/$(ARCH)/mbxboot
ifdef CONFIG_8xx
SUBDIRS += arch/ppc/8xx_io
@@ -63,10 +64,16 @@ checks:
BOOT_TARGETS = netboot znetboot zImage floppy install \
vmlinux.coff znetboot.initrd zImage.initrd vmlinux.coff.initrd
+ifdef CONFIG_MBX
+$(BOOT_TARGETS): $(CHECKS) vmlinux
+ @$(MAKECOFFBOOT) $@
+ @$(MAKEMBXBOOT) $@
+else
$(BOOT_TARGETS): $(CHECKS) vmlinux
@$(MAKECOFFBOOT) $@
@$(MAKEBOOT) $@
@$(MAKECHRPBOOT) $@
+endif
pmac_config:
rm -f .config arch/ppc/defconfig
@@ -100,10 +107,10 @@ archclean:
@$(MAKECOFFBOOT) clean
@$(MAKEBOOT) clean
@$(MAKECHRPBOOT) clean
+ @$(MAKEMBXBOOT) clean
archmrproper:
archdep:
$(MAKEBOOT) fastdep
$(MAKECHRPBOOT) fastdep
-