diff options
| author | Devin Moore <devinmoore@google.com> | 2022-01-07 16:24:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-01-07 16:24:13 +0000 |
| commit | 12e5f038a970fdf099d4450482342c1997a42fbf (patch) | |
| tree | 6f3b01297498b7f06ffb7f99e775f323d60ad951 /fastboot/fastboot.cpp | |
| parent | cecdf78a1f0971e74e9cc52f88973cc2ffc30add (diff) | |
| parent | 1af1202fbdf03d309c0d56df1e93341a8d863daf (diff) | |
Merge changes Ib5a63a7b,If00f581a
* changes:
fastboot: copy AVB footer from init_boot.img to end of partition
fastboot: Support flashing init_boot.img into init_boot partition
Diffstat (limited to 'fastboot/fastboot.cpp')
| -rw-r--r-- | fastboot/fastboot.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp index c8ef94f1d..ab429df50 100644 --- a/fastboot/fastboot.cpp +++ b/fastboot/fastboot.cpp @@ -141,6 +141,10 @@ struct Image { static Image images[] = { // clang-format off { "boot", "boot.img", "boot.sig", "boot", false, ImageType::BootCritical }, + { "init_boot", + "init_boot.img", "init_boot.sig", + "init_boot", + false, ImageType::BootCritical }, { nullptr, "boot_other.img", "boot.sig", "boot", true, ImageType::Normal }, { "cache", "cache.img", "cache.sig", "cache", true, ImageType::Extra }, { "dtbo", "dtbo.img", "dtbo.sig", "dtbo", true, ImageType::BootCritical }, @@ -1072,7 +1076,8 @@ static void flash_buf(const std::string& partition, struct fastboot_buffer *buf) { sparse_file** s; - if (partition == "boot" || partition == "boot_a" || partition == "boot_b") { + if (partition == "boot" || partition == "boot_a" || partition == "boot_b" || + partition == "init_boot" || partition == "init_boot_a" || partition == "init_boot_b") { copy_boot_avb_footer(partition, buf); } |