summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
authorWilliam Wilgus <me.theuser@yahoo.com>2017-02-10 13:53:46 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2017-10-29 17:53:04 +0100
commite9de9c1452499d852c8b4ec75cde06520fe7c961 (patch)
treed1312cb9bfe439412806c8bdf09e19c5bb36a2a2 /firmware/export
parentefb71ed0ce6afee0643025f71e48eabca297d872 (diff)
downloadrockbox-e9de9c1452499d852c8b4ec75cde06520fe7c961.tar.gz
rockbox-e9de9c1452499d852c8b4ec75cde06520fe7c961.zip
Add boot from other volumes in bootloader on targets with HAVE_MULTIVOLUME
Adds the ability to load firmware from other drives on MULTIVOLUME targets Mihail Zenkov <mihail.zenkov@gmail.com> had posted a hard coded patch to allow this on several Sansa players, I made it more universal Redirect file rockbox_main.<name> should placed in root of drive you would like to be main, if this file empty or there a single slash '/' firmware will be loaded from /.rockbox in root of this drive If instead a /<*DIRECTORY*> is supplied in rockbox_main.<name> then firmware will be loaded from /<dir>/.rockbox/ NOTES* The directory can have multiple levels however.. leading slash MUST be included trailing slash can be omitted (eg. /test/.rockbox would be simply '/test' in the redirect file) Redirect file will not work on internal drive (whatever is default boot drive) Volume with the highest index containing redirect file will be loaded first. Firmware file is checked for boot data region, if missing, firmware image will not be loaded. On failure or if no redirect file is found load will fallback to internal drive Currently only Sansa Fuze+, Sansa Clip+, Sansa Clip Zip, Sansa Fuzev2, and Sansa Fuzev1 are implemented. Players (with HAVE_MULTIVOLUME) will need #define HAVE_BOOTDATA and #define BOOT_REDIR "rockbox_main.<name>" added to their config file boot_data is implemented in crt0.s file (See g#1552) ARM and IMX233 have aleady been implemented Once these conditions are met <HAVE_MULTIBOOT> will be defined by config.h Partitions on the drives are able to have a redirect as well. Change-Id: Iada3263919f6bcad7d0d7d8279b4239aafa07ee9
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/config.h5
-rw-r--r--firmware/export/config/sansaclipplus.h2
-rw-r--r--firmware/export/config/sansaclipzip.h2
-rw-r--r--firmware/export/config/sansafuze.h3
-rw-r--r--firmware/export/config/sansafuzeplus.h2
-rw-r--r--firmware/export/config/sansafuzev2.h3
6 files changed, 17 insertions, 0 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 51e0f7a17b..475bd573d4 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -859,6 +859,11 @@ Lyre prototype 1 */
859#error HAVE_MULTIDRIVE needs to have an explicit NUM_DRIVES 859#error HAVE_MULTIDRIVE needs to have an explicit NUM_DRIVES
860#endif 860#endif
861 861
862/* note to remove multi-partition booting this could be changed to MULTIDRIVE */
863#if defined(HAVE_BOOTDATA) && defined(BOOT_REDIR) && defined(HAVE_MULTIVOLUME)
864#define HAVE_MULTIBOOT
865#endif
866
862#ifndef NUM_DRIVES 867#ifndef NUM_DRIVES
863#define NUM_DRIVES 1 868#define NUM_DRIVES 1
864#endif 869#endif
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h
index cf2b1136a3..addf7d86c0 100644
--- a/firmware/export/config/sansaclipplus.h
+++ b/firmware/export/config/sansaclipplus.h
@@ -9,6 +9,8 @@
9#define FIRMWARE_OFFSET_FILE_CRC 0 9#define FIRMWARE_OFFSET_FILE_CRC 0
10/* Define if boot data from bootloader has been enabled for the target */ 10/* Define if boot data from bootloader has been enabled for the target */
11#define HAVE_BOOTDATA 11#define HAVE_BOOTDATA
12/* define boot redirect file name allows booting from external drives */
13#define BOOT_REDIR "rockbox_main.clip+"
12 14
13#define HAVE_MULTIDRIVE 15#define HAVE_MULTIDRIVE
14#define NUM_DRIVES 2 16#define NUM_DRIVES 2
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h
index 9f1ff1f206..fc9f558eef 100644
--- a/firmware/export/config/sansaclipzip.h
+++ b/firmware/export/config/sansaclipzip.h
@@ -9,6 +9,8 @@
9#define FIRMWARE_OFFSET_FILE_CRC 0 9#define FIRMWARE_OFFSET_FILE_CRC 0
10/* Define if boot data from bootloader has been enabled for the target */ 10/* Define if boot data from bootloader has been enabled for the target */
11#define HAVE_BOOTDATA 11#define HAVE_BOOTDATA
12/* define boot redirect file name allows booting from external drives */
13#define BOOT_REDIR "rockbox_main.clipzip"
12 14
13#define HAVE_MULTIDRIVE 15#define HAVE_MULTIDRIVE
14#define NUM_DRIVES 2 16#define NUM_DRIVES 2
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config/sansafuze.h
index d674d1f88a..fae3463d75 100644
--- a/firmware/export/config/sansafuze.h
+++ b/firmware/export/config/sansafuze.h
@@ -8,6 +8,9 @@
8/* Define if boot data from bootloader has been enabled for the target */ 8/* Define if boot data from bootloader has been enabled for the target */
9#define HAVE_BOOTDATA 9#define HAVE_BOOTDATA
10 10
11/* define boot redirect file name allows booting from external drives */
12#define BOOT_REDIR "rockbox_main.fuze"
13
11#define HW_SAMPR_CAPS SAMPR_CAP_ALL 14#define HW_SAMPR_CAPS SAMPR_CAP_ALL
12 15
13/* define this if you have recording possibility */ 16/* define this if you have recording possibility */
diff --git a/firmware/export/config/sansafuzeplus.h b/firmware/export/config/sansafuzeplus.h
index af5235a6c3..2a57619b06 100644
--- a/firmware/export/config/sansafuzeplus.h
+++ b/firmware/export/config/sansafuzeplus.h
@@ -10,6 +10,8 @@
10#define MODEL_NAME "Sandisk Sansa Fuze+" 10#define MODEL_NAME "Sandisk Sansa Fuze+"
11/* Define if boot data from bootloader has been enabled for the target */ 11/* Define if boot data from bootloader has been enabled for the target */
12#define HAVE_BOOTDATA 12#define HAVE_BOOTDATA
13/* define boot redirect file name allows booting from external drives */
14#define BOOT_REDIR "rockbox_main.fuze+"
13 15
14#define HW_SAMPR_CAPS SAMPR_CAP_ALL 16#define HW_SAMPR_CAPS SAMPR_CAP_ALL
15 17
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h
index a4d90160bd..b85e0747a3 100644
--- a/firmware/export/config/sansafuzev2.h
+++ b/firmware/export/config/sansafuzev2.h
@@ -8,6 +8,9 @@
8/* Define if boot data from bootloader has been enabled for the target */ 8/* Define if boot data from bootloader has been enabled for the target */
9#define HAVE_BOOTDATA 9#define HAVE_BOOTDATA
10 10
11/* define boot redirect file name allows booting from external drives */
12#define BOOT_REDIR "rockbox_main.fuze2"
13
11#define HW_SAMPR_CAPS SAMPR_CAP_ALL 14#define HW_SAMPR_CAPS SAMPR_CAP_ALL
12 15
13/* define this if you have recording possibility */ 16/* define this if you have recording possibility */