multiboot: Add v1 boot protocol

v1 passes the drive and partition number of the boot volume
instead of using the volume number. The volume number isn't
reliable because the same filesystem might get a different
volume number once the firmware is loaded, which will cause
the firmware to use the wrong root volume and fail to locate
the correct .rockbox directory.

Using drive and partition numbers avoids this issue because
drive numbering is fixed and determined by the target.

Change-Id: I7e68b892d9424a1f686197a6122e139b438e5f7e

1 files changed, 10 insertions, 1 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 5e2451e41b..36927dd890 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -2546,7 +2546,16 @@ static bool dbg_boot_data(void)
     {
         simplelist_addline("Boot data valid");
         simplelist_addline("Version: %d", (int)boot_data.version);
-        simplelist_addline("Boot volume: %d", (int)boot_data.boot_volume);
+
+        if (boot_data.version == 0)
+        {
+            simplelist_addline("Boot volume: %d", (int)boot_data._boot_volume);
+        }
+        else if (boot_data.version == 1)
+        {
+            simplelist_addline("Boot drive: %d", (int)boot_data.boot_drive);
+            simplelist_addline("Boot partition: %d", (int)boot_data.boot_partition);
+        }
     }
 
     simplelist_addline("Bootdata RAW:");