Commit 64cb7450 authored by Tom Rini's avatar Tom Rini

Merge bk://ppc@ppc.bkbits.net/for-linus-ppc

into kernel.crashing.org:/home/trini/work/kernel/pristine/for-linus-ppc
parents 2bbc35cb f603513c
......@@ -45,7 +45,7 @@ drivers-$(CONFIG_4xx) += arch/ppc/4xx_io/
drivers-$(CONFIG_8260) += arch/ppc/8260_io/
drivers-$(CONFIG_OCP) += arch/ppc/ocp/
BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd pImage vmlinux.sm
BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm
.PHONY: $(BOOT_TARGETS)
......@@ -56,8 +56,17 @@ AFLAGS_vmlinux.lds.o := -Upowerpc
# All the instructions talk about "make bzImage".
bzImage: zImage
boot := arch/$(ARCH)/boot
$(BOOT_TARGETS): vmlinux
$(Q)$(MAKE) $(build)=arch/ppc/boot $@
$(Q)$(MAKE) $(build)=$(boot) $@
uImage: vmlinux
$(Q)$(MAKE) $(build)=$(boot)/images $(boot)/images/$@
define archhelp
@echo ' uImage - Create a bootable image for U-Boot / PPCBoot'
endef
archclean:
$(Q)$(MAKE) $(clean)=arch/ppc/boot
......
......@@ -2,6 +2,8 @@
# This dir holds all of the images for PPC machines.
# Tom Rini January 2001
MKIMAGE := $(srctree)/scripts/mkuboot.sh
extra-y := vmlinux.bin vmlinux.gz
OBJCOPYFLAGS_vmlinux.bin := -O binary
......@@ -11,5 +13,15 @@ $(obj)/vmlinux.bin: vmlinux FORCE
$(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE
$(call if_changed,gzip)
quite_cmd_uimage = UIMAGE $@
cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A ppc -O linux -T kernel \
-C gzip -a 00000000 -e 00000000 -n 'Linux-$(KERNELRELEASE)' \
-d $< $@
targets += uImage
$(obj)/uImage: $(obj)/vmlinux.gz
$(call if_changed,uimage)
@echo ' Image $@ is ready'
# Files generated that shall be removed upon make clean
clean-files := sImage vmapus vmlinux* miboot* zImage*
clean-files := sImage vmapus vmlinux* miboot* zImage* uImage
#!/bin/bash
#
# Build PPCBoot image when `mkimage' tool is available.
# Build U-Boot image when `mkimage' tool is available.
#
MKIMAGE=$(type -path mkimage)
if [ -z "${MKIMAGE}" ]; then
# Doesn't exist
echo '"mkimage" command not found - PPCBoot images will not be built' >&2
echo '"mkimage" command not found - U-Boot images will not be built' >&2
exit 0;
fi
# Call "mkimage" to create PPCBoot image
# Call "mkimage" to create U-Boot image
${MKIMAGE} "$@"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment