From 2c7e4e7fd3b56bc85ce31f1efbe2813de7f5c5aa Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Tue, 11 Jun 2019 17:40:43 +0800 Subject: [PATCH] rk: arm64: support build [z]boot.img from existing boot.img The existing boot.img from $(BOOT_IMG). Change-Id: Iaf78185546200acb10ae13f541197722149624e1 Signed-off-by: Tao Huang --- arch/arm64/Makefile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index c8cfc31e7f6f..028f0351df18 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -193,11 +193,26 @@ make_boot_img := \ -o zboot.img && \ echo ' Image: zboot.img (with Image.lz4 $(if $(RAMDISK_IMG),'ramdisk.img ')resource.img) is ready' +repack_boot_img := \ + $(srctree)/scripts/repack-bootimg \ + --boot_img $(BOOT_IMG) --out out \ + --kernel $(objtree)/arch/arm64/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/arm64/boot/Image.lz4 \ + --second resource.img \ + -o zboot.img && \ + echo ' Image: zboot.img ($(BOOT_IMG) + Image.lz4 + resource.img) is ready' + %.img: rockchip/%.dtb kernel.img $(LOGO) $(LOGO_KERNEL) $(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/arm64/boot/dts/rockchip/$*.dtb $(LOGO) $(LOGO_KERNEL) @echo ' Image: resource.img (with $*.dtb $(LOGO) $(LOGO_KERNEL)) is ready' - $(Q) if [ -x $(srctree)/scripts/mkbootimg ]; then $(make_boot_img); fi + $(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 +CLEAN_DIRS += out CLEAN_FILES += boot.img kernel.img resource.img zboot.img