From 556c46bfb9f79955b6f66c55c2581cfd38d2c7ee Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Mon, 17 Jul 2023 13:41:38 -0700 Subject: [PATCH] Look for radio.img and bootloader.img in ANDROID_PRODUCT_OUT Test: fastboot flash bootloader and fastboot flash radio both work Change-Id: I79674469c0df3dd592e5fcf840fef0dcc3f11d33 --- fastboot/fastboot.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp index 30eb7b5fc..1ce4e8b2b 100644 --- a/fastboot/fastboot.cpp +++ b/fastboot/fastboot.cpp @@ -119,6 +119,9 @@ fastboot::FastBootDriver* fb = nullptr; static std::vector images = { // clang-format off { "boot", "boot.img", "boot.sig", "boot", false, ImageType::BootCritical }, + { "bootloader", + "bootloader.img", "", "bootloader", + true, ImageType::Extra }, { "init_boot", "init_boot.img", "init_boot.sig", "init_boot", @@ -131,6 +134,7 @@ static std::vector images = { { "odm_dlkm", "odm_dlkm.img", "odm_dlkm.sig", "odm_dlkm", true, ImageType::Normal }, { "product", "product.img", "product.sig", "product", true, ImageType::Normal }, { "pvmfw", "pvmfw.img", "pvmfw.sig", "pvmfw", true, ImageType::BootCritical }, + { "radio", "radio.img", "", "radio", true, ImageType::Extra }, { "recovery", "recovery.img", "recovery.sig", "recovery", true, ImageType::BootCritical }, { "super", "super.img", "super.sig", "super", true, ImageType::Extra }, { "system", "system.img", "system.sig", "system", false, ImageType::Normal },