commit f6361d872235d2baae8a0eb0bb2cbb53178d755f
author Vineela Tummalapalli <vineela.tummalapalli@intel.com> Thu Nov 10 03:10:49 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 10 03:10:49 2016 +0000
tree e467e0a3ba4bd5dd952e9dbfb15f69365cd538c6
parent f78a6cb5060298c22a12b1117deb8d1d12d8e129
parent 9128e5f85a839282ce890f614670f4b20af793ed

Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 am: 118e814bfe am: 62aaba5a3f
am: 9128e5f85a

Change-Id: I8bb780f90c5f90219d4e4d6c72dd67dce40040c7

bootloader_message/bootloader_message.cpp

diff --git a/bootloader_message/bootloader_message.cpp b/bootloader_message/bootloader_message.cpp
index e0c95d2..16e8df1 100644
--- a/bootloader_message/bootloader_message.cpp
+++ b/bootloader_message/bootloader_message.cpp
@@ -164,6 +164,19 @@
   return write_bootloader_message(boot, err);
 }
 
+bool write_reboot_bootloader(std::string* err) {
+  bootloader_message boot;
+  if (!read_bootloader_message(&boot, err)) {
+    return false;
+  }
+  if (boot.command[0] != '\0') {
+    *err = "Bootloader command pending.";
+    return false;
+  }
+  strlcpy(boot.command, "bootonce-bootloader", sizeof(boot.command));
+  return write_bootloader_message(boot, err);
+}
+
 bool read_wipe_package(std::string* package_data, size_t size, std::string* err) {
   package_data->resize(size);
   return read_misc_partition(&(*package_data)[0], size, WIPE_PACKAGE_OFFSET_IN_MISC, err);
@@ -174,6 +187,11 @@
                               WIPE_PACKAGE_OFFSET_IN_MISC, err);
 }
 
+extern "C" bool write_reboot_bootloader(void) {
+  std::string err;
+  return write_reboot_bootloader(&err);
+}
+
 extern "C" bool write_bootloader_message(const char* options) {
   std::string err;
   return write_bootloader_message({options}, &err);

bootloader_message/include/bootloader_message/bootloader_message.h

diff --git a/bootloader_message/include/bootloader_message/bootloader_message.h b/bootloader_message/include/bootloader_message/bootloader_message.h
index f343c64..75d2aca 100644
--- a/bootloader_message/include/bootloader_message/bootloader_message.h
+++ b/bootloader_message/include/bootloader_message/bootloader_message.h
@@ -184,6 +184,9 @@
 bool write_bootloader_message(const std::vector<std::string>& options, std::string* err);
 bool clear_bootloader_message(std::string* err);
 
+// Writes the reboot-bootloader reboot reason to the bootloader_message.
+bool write_reboot_bootloader(std::string* err);
+
 bool read_wipe_package(std::string* package_data, size_t size, std::string* err);
 bool write_wipe_package(const std::string& package_data, std::string* err);
 
@@ -193,6 +196,7 @@
 
 // C Interface.
 bool write_bootloader_message(const char* options);
+bool write_reboot_bootloader(void);
 
 #endif  // ifdef __cplusplus