From 2c28c22183853eb3fc3875f18b3bf6238275173e Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Thu, 17 Oct 2019 14:21:26 +0800 Subject: [PATCH] rk: arm64: support make image with script mkimg Change-Id: I6067d9a4d2b68b63c449646f36255dde3d795611 Signed-off-by: Tao Huang --- arch/arm64/Makefile | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 2b3e9054cf65..443509d7b999 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -178,43 +178,9 @@ endif LOGO := $(notdir $(wildcard $(srctree)/logo.bmp)) LOGO_KERNEL := $(notdir $(wildcard $(srctree)/logo_kernel.bmp)) -RAMDISK_IMG := $(notdir $(wildcard $(objtree)/ramdisk.img)) -make_boot_img := \ - $(srctree)/scripts/mkbootimg \ - --kernel $(objtree)/arch/arm64/boot/Image \ - $(if $(RAMDISK_IMG),--ramdisk $(objtree)/ramdisk.img) \ - --second resource.img \ - -o boot.img && \ - echo ' Image: boot.img (with Image $(if $(RAMDISK_IMG),'ramdisk.img ')resource.img) is ready'; \ - $(srctree)/scripts/mkbootimg \ - --kernel $(objtree)/arch/arm64/boot/Image.lz4 \ - $(if $(RAMDISK_IMG),--ramdisk $(objtree)/ramdisk.img) \ - --second resource.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 -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/arm64/boot/dts/rockchip/$*.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