am 1b3195cb: am 4c223f4e: Merge "Add slot_suffix field to struct bootloader_message."

* commit '1b3195cb917dcaff5d563d3e17e497b855442461':
  Add slot_suffix field to struct bootloader_message.
This commit is contained in:
David Zeuthen 2015-09-03 15:28:15 +00:00 committed by Android Git Automerger
commit ceb81e4931

View file

@ -39,6 +39,13 @@
* multiple times, so that the UI can reflect which invocation of the
* package it is. If the value is of the format "#/#" (eg, "1/3"),
* the UI will add a simple indicator of that status.
*
* The slot_suffix field is used for A/B implementations where the
* bootloader does not set the androidboot.ro.boot.slot_suffix kernel
* commandline parameter. This is used by fs_mgr to mount /system and
* other partitions with the slotselect flag set in fstab. A/B
* implementations are free to use all 32 bytes and may store private
* data past the first NUL-byte in this field.
*/
struct bootloader_message {
char command[32];
@ -51,7 +58,8 @@ struct bootloader_message {
// stage string (for multistage packages) and possible future
// expansion.
char stage[32];
char reserved[224];
char slot_suffix[32];
char reserved[192];
};
/* Read and write the bootloader command from the "misc" partition.