From f89f356895178a1ce80e62c5eeb0e9eb44c840aa Mon Sep 17 00:00:00 2001
From: Tao Huang <huangtao@rock-chips.com>
Date: Tue, 11 Jun 2019 21:42:40 +0800
Subject: [PATCH] rk: ARM: support build [z]boot.img from existing boot.img

The existing boot.img from $(BOOT_IMG).

Change-Id: I3751e56ee88b3ece03999dc68c7c2595807bcbf7
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
---
 arch/arm/Makefile | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 207925637f4a..452b1c0f1e3d 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -396,22 +396,39 @@ ifdef CONFIG_FB
 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 "$(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 [ -x $(srctree)/scripts/mkbootimg ]; then \
-		$(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'; \
-	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