From d89ad4931ae88625966ff3b663308d621c88f990 Mon Sep 17 00:00:00 2001 From: hmz007 Date: Thu, 22 Dec 2022 13:19:03 +0800 Subject: [PATCH] android: mkbootimg: allow dtb.img to be optional Signed-off-by: hmz007 --- system/tools/mkbootimg/mkbootimg.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/tools/mkbootimg/mkbootimg.py b/system/tools/mkbootimg/mkbootimg.py index e0b0839e49d..7fd61cf96e2 100755 --- a/system/tools/mkbootimg/mkbootimg.py +++ b/system/tools/mkbootimg/mkbootimg.py @@ -131,7 +131,7 @@ def write_header_v3_and_above(args): def write_vendor_boot_header(args): - if filesize(args.dtb) == 0: + if filesize(args.dtb) == 0 and filesize(args.second) == 0: raise ValueError('DTB image must not be empty.') if args.header_version > 3: @@ -252,7 +252,7 @@ def write_header(args): args.output.write(pack('I', BOOT_IMAGE_HEADER_V2_SIZE)) if args.header_version > 1: - if filesize(args.dtb) == 0: + if filesize(args.dtb) == 0 and filesize(args.second) == 0: raise ValueError('DTB image must not be empty.') # dtb size in bytes