2 files changed, 29 insertions, 1 deletions

diff --git a/firmware/common/bootdata.c b/firmware/common/bootdata.c
index fa74c5fe91..224a48d0c1 100644
--- a/firmware/common/bootdata.c
+++ b/firmware/common/bootdata.c
@@ -42,6 +42,20 @@ static bool verify_boot_data_v0(void)
     return true;
 }
 
+static bool verify_boot_data_v1(void) INIT_ATTR;
+static bool verify_boot_data_v1(void)
+{
+    /* validate protocol version */
+    if (boot_data.version != 1)
+        return false;
+
+    /* validate length */
+    if (boot_data.length != 4)
+        return false;
+
+    return true;
+}
+
 struct verify_bd_entry
 {
     int version;
@@ -50,6 +64,7 @@ struct verify_bd_entry
 
 static const struct verify_bd_entry verify_bd[] INITDATA_ATTR = {
     { 0, verify_boot_data_v0 },
+    { 1, verify_boot_data_v1 },
 };
 
 void verify_boot_data(void)
diff --git a/firmware/common/multiboot.c b/firmware/common/multiboot.c
index c292aa1c30..8d6573d2dd 100644
--- a/firmware/common/multiboot.c
+++ b/firmware/common/multiboot.c
@@ -23,6 +23,7 @@
 #include "crc32.h"
 #include "loader_strerror.h"
 #include "file.h"
+#include "disk.h"
 #include <string.h>
 #include <stdio.h>
 
@@ -30,10 +31,20 @@ static void write_bootdata_v0(struct boot_data_t *data, unsigned int boot_volume
 {
     memset(data->payload, data->length, 0);
 
-    data->boot_volume = boot_volume;
+    data->_boot_volume = boot_volume;
     data->version = 0;
 }
 
+static void write_bootdata_v1(struct boot_data_t *data, unsigned int boot_volume)
+{
+    memset(data->payload, data->length, 0);
+
+    data->_boot_volume = 0xff;
+    data->version = 1;
+    data->boot_drive = volume_drive(boot_volume);
+    data->boot_partition = volume_partition(boot_volume);
+}
+
 /* Write bootdata into location in FIRMWARE marked by magic header
  * Assumes buffer is already loaded with the firmware image
  * We just need to find the location and write data into the
@@ -68,6 +79,8 @@ bool write_bootdata(unsigned char* buf, int len, unsigned int boot_volume)
         /* Write boot data according to the selected protocol */
         if (proto_version == 0)
             write_bootdata_v0(data, boot_volume);
+        else if (proto_version == 1)
+            write_bootdata_v1(data, boot_volume);
         else
             break;