summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-12-14 07:29:49 +0100
committerTao Bao <tbao@google.com>2016-12-14 07:36:02 +0100
commitc0336399ae96f2a93663020efe9c75c56c19fd98 (patch)
treeb49ca26a9ac9fc49be3c6d942eecb0e7f38f13f4
parentMerge "Add tests for setup-bcb and clear-bcb via uncrypt." (diff)
downloadandroid_bootable_recovery-c0336399ae96f2a93663020efe9c75c56c19fd98.tar
android_bootable_recovery-c0336399ae96f2a93663020efe9c75c56c19fd98.tar.gz
android_bootable_recovery-c0336399ae96f2a93663020efe9c75c56c19fd98.tar.bz2
android_bootable_recovery-c0336399ae96f2a93663020efe9c75c56c19fd98.tar.lz
android_bootable_recovery-c0336399ae96f2a93663020efe9c75c56c19fd98.tar.xz
android_bootable_recovery-c0336399ae96f2a93663020efe9c75c56c19fd98.tar.zst
android_bootable_recovery-c0336399ae96f2a93663020efe9c75c56c19fd98.zip
-rw-r--r--bootloader_message/include/bootloader_message/bootloader_message.h5
-rw-r--r--install.cpp9
-rw-r--r--recovery.cpp16
3 files changed, 4 insertions, 26 deletions
diff --git a/bootloader_message/include/bootloader_message/bootloader_message.h b/bootloader_message/include/bootloader_message/bootloader_message.h
index b3d2182df..ec47facf6 100644
--- a/bootloader_message/include/bootloader_message/bootloader_message.h
+++ b/bootloader_message/include/bootloader_message/bootloader_message.h
@@ -42,8 +42,9 @@ static const size_t WIPE_PACKAGE_OFFSET_IN_MISC = 16 * 1024;
* It is also updated by the bootloader when firmware update
* is complete (to boot into recovery for any final cleanup)
*
- * The status field is written by the bootloader after the
- * completion of an "update-radio" or "update-hboot" command.
+ * The status field was used by the bootloader after the completion
+ * of an "update-radio" or "update-hboot" command, which has been
+ * deprecated since Froyo.
*
* The recovery field is only written by linux and used
* for the system to send a message to recovery or the
diff --git a/install.cpp b/install.cpp
index dd6ed81cf..b23586c6e 100644
--- a/install.cpp
+++ b/install.cpp
@@ -335,15 +335,6 @@ try_update_binary(const char* path, ZipArchiveHandle zip, bool* wipe_cache,
// progress bar within the segment defined by the most
// recent progress command.
//
- // firmware <"hboot"|"radio"> <filename>
- // arrange to install the contents of <filename> in the
- // given partition on reboot.
- //
- // (API v2: <filename> may start with "PACKAGE:" to
- // indicate taking a file from the OTA package.)
- //
- // (API v3: this command no longer exists.)
- //
// ui_print <string>
// display <string> on the screen.
//
diff --git a/recovery.cpp b/recovery.cpp
index 5213301c9..f53e20c8c 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -169,21 +169,7 @@ struct selabel_handle* sehandle;
* -- after this, rebooting will (try to) restart the main system --
* 7. ** if install failed **
* 7a. prompt_and_wait() shows an error icon and waits for the user
- * 7b; the user reboots (pulling the battery, etc) into the main system
- * 8. main() calls maybe_install_firmware_update()
- * ** if the update contained radio/hboot firmware **:
- * 8a. m_i_f_u() writes BCB with "boot-recovery" and "--wipe_cache"
- * -- after this, rebooting will reformat cache & restart main system --
- * 8b. m_i_f_u() writes firmware image into raw cache partition
- * 8c. m_i_f_u() writes BCB with "update-radio/hboot" and "--wipe_cache"
- * -- after this, rebooting will attempt to reinstall firmware --
- * 8d. bootloader tries to flash firmware
- * 8e. bootloader writes BCB with "boot-recovery" (keeping "--wipe_cache")
- * -- after this, rebooting will reformat cache & restart main system --
- * 8f. erase_volume() reformats /cache
- * 8g. finish_recovery() erases BCB
- * -- after this, rebooting will (try to) restart the main system --
- * 9. main() calls reboot() to boot main system
+ * 7b. the user reboots (pulling the battery, etc) into the main system
*/
// open a given path, mounting partitions as necessary