Skip to content
Snippets Groups Projects

flashers: remove need for heimdall_wait_for_device.sh and fix heimdall-isorec flash

Merged Imported Administrator requested to merge heimdall-update into master
2 files
+ 17
12
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 16
9
@@ -356,7 +356,7 @@ flash_mount_bind = [
Flasher abstraction. Allowed variables:
$BOOT: Path to the /boot partition
$DTB: Set to "-dtb" if deviceinfo_append_dtb is set, otherwise ""
$DTB: Name of device dtb without .dtb extension
$FLAVOR: Backwards compatibility with old mkinitfs (pma#660)
$IMAGE: Path to the combined boot/rootfs image
$IMAGE_SPLIT_BOOT: Path to the (split) boot image
@@ -421,16 +421,16 @@ flashers: dict[str, dict[str, bool | list[str] | dict[str, list[list[str]]]]] =
"actions": {
"list_devices": [["heimdall", "detect"]],
"flash_rootfs": [
["heimdall_wait_for_device.sh"],
["heimdall", "flash", "--$PARTITION_ROOTFS", "$IMAGE"],
+2
["heimdall", "flash", "--wait", "--$PARTITION_ROOTFS", "$IMAGE"],
],
"flash_kernel": [
[
"heimdall_flash_kernel.sh",
"heimdall_flash_isorec_kernel.sh",
"$BOOT/initramfs$FLAVOR",
"$PARTITION_INITFS",
"$BOOT/vmlinuz$FLAVOR$DTB",
"$BOOT/vmlinuz$FLAVOR",
"$PARTITION_KERNEL",
"$BOOT/$DTB",
]
],
},
@@ -442,14 +442,21 @@ flashers: dict[str, dict[str, bool | list[str] | dict[str, list[list[str]]]]] =
"actions": {
"list_devices": [["heimdall", "detect"]],
"flash_rootfs": [
["heimdall_wait_for_device.sh"],
["heimdall", "flash", "--$PARTITION_ROOTFS", "$IMAGE", "$NO_REBOOT", "$RESUME"],
[
"heimdall",
"flash",
"--wait",
"--$PARTITION_ROOTFS",
"$IMAGE",
"$NO_REBOOT",
"$RESUME",
],
],
"flash_kernel": [
["heimdall_wait_for_device.sh"],
[
"heimdall",
"flash",
"--wait",
"--$PARTITION_KERNEL",
"$BOOT/boot.img$FLAVOR",
"$NO_REBOOT",
@@ -478,10 +485,10 @@ flashers: dict[str, dict[str, bool | list[str] | dict[str, list[list[str]]]]] =
["rm", "-f", "/vbmeta.img"],
],
"flash_lk2nd": [
["heimdall_wait_for_device.sh"],
[
"heimdall",
"flash",
"--wait",
"--$PARTITION_KERNEL",
"$BOOT/lk2nd.img",
"$NO_REBOOT",
Loading