diff --git a/arch/arm/Makefile b/arch/arm/Makefile index a9b7443a3ba9..4e12870aaeaa 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -397,40 +397,8 @@ LOGO := $(notdir $(wildcard $(srctree)/logo.bmp)) LOGO_KERNEL := $(notdir $(wildcard $(srctree)/logo_kernel.bmp)) endif -make_boot_img := \ - $(srctree)/scripts/mkbootimg \ - --kernel $(objtree)/arch/arm/boot/Image \ - --second resource.img \ - -o boot.img && \ - echo ' Image: boot.img (with Image resource.img) is ready'; \ - $(srctree)/scripts/mkbootimg \ - --kernel $(objtree)/arch/arm/boot/zImage \ - --second resource.img \ - -o zboot.img && \ - echo ' Image: zboot.img (with zImage resource.img) is ready' - -repack_boot_img := \ - $(srctree)/scripts/repack-bootimg \ - --boot_img $(BOOT_IMG) --out out \ - --kernel $(objtree)/arch/arm/boot/Image \ - --second resource.img \ - -o boot.img && \ - echo ' Image: boot.img ($(BOOT_IMG) + Image + resource.img) is ready'; \ - $(srctree)/scripts/repack-bootimg \ - --boot_img $(BOOT_IMG) --out out \ - --kernel $(objtree)/arch/arm/boot/zImage \ - --second resource.img \ - -o zboot.img && \ - echo ' Image: zboot.img ($(BOOT_IMG) + zImage + resource.img) is ready' - %.img: %.dtb kernel.img $(LOGO) $(LOGO_KERNEL) - $(Q) if [ -f $(srctree)/$(LOGO) -a -e $(srctree)/scripts/bmpconvert ]; then $(srctree)/scripts/bmpconvert $(srctree)/$(LOGO); fi - $(Q) if [ -f $(srctree)/$(LOGO_KERNEL) -a -e $(srctree)/scripts/bmpconvert ]; then $(srctree)/scripts/bmpconvert $(srctree)/$(LOGO_KERNEL); fi - $(Q) if [ -f $(srctree)/$(LOGO) -a "$(srctree)" != "$(objtree)" ]; then cp -a $(srctree)/$(LOGO) $(objtree)/; fi - $(Q) if [ -f $(srctree)/$(LOGO_KERNEL) -a "$(srctree)" != "$(objtree)" ]; then cp -a $(srctree)/$(LOGO_KERNEL) $(objtree)/; fi - $(Q)scripts/resource_tool $(objtree)/arch/arm/boot/dts/$*.dtb $(LOGO) $(LOGO_KERNEL) - @echo ' Image: resource.img (with $*.dtb $(LOGO) $(LOGO_KERNEL)) is ready' - $(Q) if [ -f "$(BOOT_IMG)" -a -x $(srctree)/scripts/repack-bootimg ]; then $(repack_boot_img); elif [ -x $(srctree)/scripts/mkbootimg ]; then $(make_boot_img); fi + $(Q)$(srctree)/scripts/mkimg --dtb $*.dtb CLEAN_DIRS += out CLEAN_FILES += boot.img kernel.img resource.img zboot.img