Skip to content

Commit 097b320

Browse files
committed
rk: scripts: Fix repack bootimg for boot image v3
v3 do not support second. Signed-off-by: Tao Huang <huangtao@rock-chips.com> Change-Id: I5cd6d402be5adb35f0634a5af19c4310582d25ee
1 parent 3e2e3e5 commit 097b320

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

scripts/mkimg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,14 @@ repack_boot_img()
102102
--second resource.img \
103103
--dtb ${DTB_PATH} \
104104
-o boot.img &&
105-
echo " Image: boot.img (${BOOT_IMG} + Image + resource.img) is ready";
105+
echo " Image: boot.img (${BOOT_IMG} + Image) is ready";
106106
${srctree}/scripts/repack-bootimg \
107107
--boot_img ${BOOT_IMG} --out ${OUT} \
108108
${KERNEL_ZIMAGE_ARG} \
109109
--second resource.img \
110110
--dtb ${DTB_PATH} \
111111
-o zboot.img && \
112-
echo " Image: zboot.img (${BOOT_IMG} + ${ZIMAGE} + resource.img) is ready"
112+
echo " Image: zboot.img (${BOOT_IMG} + ${ZIMAGE}) is ready"
113113
}
114114

115115
check_mkimage()

scripts/repack-bootimg

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,13 @@ if [ $recovery_dtbo_size -gt 0 -a -e "$recovery_dtbo" ]; then
136136
RECOVERY_DTBO="--recovery_dtbo $recovery_dtbo"
137137
fi
138138

139+
if [ $version -lt 3 ]; then
140+
SECOND="--second $second"
141+
fi
142+
139143
$srctree/scripts/mkbootimg \
140144
--kernel $kernel \
141-
--second $second \
145+
$SECOND \
142146
--ramdisk $ramdisk \
143147
$DTB \
144148
$RECOVERY_DTBO \

0 commit comments

Comments
 (0)