Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d11ca1ef authored by Lucas Wei's avatar Lucas Wei Committed by Automerger Merge Worker
Browse files

Merge "fastboot: Add vendor_kernel_boot" am: a85c7196 am: 436e9a79 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2046445



Change-Id: Ieaae835a6b3a88c37a2c54d1c4003569f150dccf
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 288ce44a 436e9a79

fastboot/fastboot.bash

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ _fastboot_cmd_flash() { 


    cur="${COMP_WORDS[COMP_CWORD]}"

    if [[ $i -eq $COMP_CWORD ]]; then

        partitions="boot bootloader dtbo init_boot modem odm odm_dlkm oem product pvmfw radio recovery system system_dlkm vbmeta vendor vendor_dlkm"

        partitions="boot bootloader dtbo init_boot modem odm odm_dlkm oem product pvmfw radio recovery system system_dlkm vbmeta vendor vendor_dlkm vendor_kernel_boot"

        COMPREPLY=( $(compgen -W "$partitions" -- $cur) )

    else

        _fastboot_util_complete_local_file "${cur}" '!*.img'

fastboot/fastboot.cpp

+5 −0
Original line number Diff line number Diff line
@@ -186,6 +186,11 @@ static Image images[] = { 
                  "vendor_dlkm.img",  "vendor_dlkm.sig",

                                                      "vendor_dlkm",

                                                                  true,  ImageType::Normal },

    { "vendor_kernel_boot",

                  "vendor_kernel_boot.img",

                                      "vendor_kernel_boot.sig",

                                                      "vendor_kernel_boot",

                                                                  true,  ImageType::BootCritical },

    { nullptr,    "vendor_other.img", "vendor.sig",   "vendor",   true,  ImageType::Normal },

        // clang-format on

};