Skip to content

Commit ff0e62f

Browse files
Andy Yanrkhuangtao
Andy Yan
authored andcommittedJul 9, 2018
arm64: support pack zboot.img
zboot.img: Image.lz4 + resouorce.img boot.img: Image + resource.img Change-Id: I97bc39de99ce85cc21f2491a6db59d1e015f67d0 Signed-off-by: Andy Yan <[email protected]> Signed-off-by: Tao Huang <[email protected]>
1 parent 73462a3 commit ff0e62f

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed
 

‎arch/arm64/Makefile

+15-4
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ define archhelp
163163
echo ' install to $$(INSTALL_PATH) and run lilo'
164164
endef
165165

166-
kernel.img: Image
166+
kernel.img: Image.lz4
167167
$(Q)$(srctree)/scripts/mkkrnlimg $(objtree)/arch/arm64/boot/Image $(objtree)/kernel.img >/dev/null
168168
@echo ' Image: kernel.img is ready'
169169
ifdef CONFIG_MODULES
@@ -177,6 +177,17 @@ LOGO_KERNEL := $(notdir $(wildcard $(srctree)/logo_kernel.bmp))
177177
$(Q) if [ -f $(srctree)/$(LOGO_KERNEL) -a "$(srctree)" != "$(objtree)" ]; then cp -a $(srctree)/$(LOGO_KERNEL) $(objtree)/; fi
178178
$(Q)$(srctree)/scripts/resource_tool $(objtree)/arch/arm64/boot/dts/rockchip/$*.dtb $(LOGO) $(LOGO_KERNEL)
179179
@echo ' Image: resource.img (with $*.dtb $(LOGO) $(LOGO_KERNEL)) is ready'
180-
$(Q) if [ -x $(srctree)/scripts/mkbootimg ]; then $(srctree)/scripts/mkbootimg --kernel $(objtree)/arch/arm64/boot/Image --second resource.img -o boot.img && echo ' Image: boot.img (with Image resource.img) is ready'; fi
181-
182-
CLEAN_FILES += boot.img kernel.img resource.img
180+
$(Q) if [ -x $(srctree)/scripts/mkbootimg ]; then \
181+
$(srctree)/scripts/mkbootimg \
182+
--kernel $(objtree)/arch/arm64/boot/Image \
183+
--second resource.img \
184+
-o boot.img && \
185+
echo ' Image: boot.img (with Image resource.img) is ready'; \
186+
$(srctree)/scripts/mkbootimg \
187+
--kernel $(objtree)/arch/arm64/boot/Image.lz4 \
188+
--second resource.img \
189+
-o zboot.img && \
190+
echo ' Image: zboot.img (with Image.lz4 resource.img) is ready'; \
191+
fi
192+
193+
CLEAN_FILES += boot.img kernel.img resource.img zboot.img

0 commit comments

Comments
 (0)