enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xiaomi-elish: add slot_suffix arg to kernel cmdline for qbootctl

Browse Source
This commit is contained in:
amazingfate 2023-12-05 19:19:06 +08:00 committed by Jianfeng Liu
parent 43f7b4533e
commit 8289ba7bf4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/image-output-abl.sh
View File

@ -28,16 +28,17 @@ function post_build_image__900_convert_to_abl_img() {
if [ ${#ABL_DTB_LIST[@]} -ne 0 ]; then
display_alert "Going to create abl kernel boot image" "${EXTENSION}" "info"
source ${new_rootfs_image_mount_dir}/boot/armbianEnv.txt
gzip -c ${new_rootfs_image_mount_dir}/boot/vmlinuz-*-* > ${DESTIMG}/Image.gz
for dtb_name in "${ABL_DTB_LIST[@]}"; do
display_alert "Creatng abl kernel boot image with dtb ${dtb_name}" "${EXTENSION}" "info"
display_alert "Creatng abl kernel boot image with dtb ${dtb_name} and cmdline root=UUID=${new_rootfs_image_uuid} slot_suffix=${abl_boot_partition_label#boot}" "${EXTENSION}" "info"
cat ${DESTIMG}/Image.gz ${new_rootfs_image_mount_dir}/usr/lib/linux-image-*/qcom/${dtb_name}.dtb > ${DESTIMG}/Image.gz-${dtb_name}
/usr/bin/mkbootimg \
--kernel ${DESTIMG}/Image.gz-${dtb_name} \
--ramdisk ${new_rootfs_image_mount_dir}/boot/initrd.img-*-* \
--base 0x0 \
--second_offset 0x00f00000 \
--cmdline "root=UUID=${new_rootfs_image_uuid}" \
--cmdline "root=UUID=${new_rootfs_image_uuid} slot_suffix=${abl_boot_partition_label#boot}" \
--kernel_offset 0x8000 \
--ramdisk_offset 0x1000000 \
--tags_offset 0x100 \

4
packages/bsp/xiaomi-elish/zz-update-abl-kernel
View File

@ -18,12 +18,13 @@ gzip -c /boot/vmlinuz-*-sm8250-arm64 > /tmp/Image.gz
cat /tmp/Image.gz /usr/lib/linux-image-*-sm8250-arm64/qcom/sm8250-xiaomi-elish-${panel_type}.dtb > /tmp/Image.gz-dtb-${panel_type}
source /boot/armbianEnv.txt
/usr/bin/mkbootimg \
--kernel /tmp/Image.gz-dtb-${panel_type} \
--ramdisk /boot/initrd.img-*-sm8250-arm64 \
--base 0x0 \
--second_offset 0x00f00000 \
--cmdline "root=UUID=${new_rootfs_image_uuid}" \
--cmdline "root=UUID=${new_rootfs_image_uuid} slot_suffix=${abl_boot_partition_label#boot}" \
--kernel_offset 0x8000 \
--ramdisk_offset 0x1000000 \
--tags_offset 0x100 \
@ -31,7 +32,6 @@ cat /tmp/Image.gz /usr/lib/linux-image-*-sm8250-arm64/qcom/sm8250-xiaomi-elish-$
-o /boot/armbian-kernel-${panel_type}.img
rm -f /tmp/Image.gz /tmp/Image.gz-dtb-${panel_type}
source /boot/armbianEnv.txt
if [ -n "$abl_boot_partition_label" ];then
echo abl boot partition label is $abl_boot_partition_label
dd if=/boot/armbian-kernel-${panel_type}.img of=/dev/disk/by-partlabel/${abl_boot_partition_label}