diff options
-rw-r--r-- | apps/features.txt | 4 | ||||
-rw-r--r-- | firmware/export/config/sansaclipplus.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sansaclipv2.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sansaclipzip.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sansafuze.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sansafuzev2.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/crt0.S | 11 |
7 files changed, 24 insertions, 1 deletions
diff --git a/apps/features.txt b/apps/features.txt index 997727dbd9..3c0b0a3856 100644 --- a/apps/features.txt +++ b/apps/features.txt | |||
@@ -284,3 +284,7 @@ hardware_click | |||
284 | #if defined(HAVE_PLAY_FREQ) | 284 | #if defined(HAVE_PLAY_FREQ) |
285 | play_frequency | 285 | play_frequency |
286 | #endif | 286 | #endif |
287 | |||
288 | #if defined(HAVE_BOOTDATA) | ||
289 | boot_data | ||
290 | #endif | ||
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h index 07cf03280a..cf2b1136a3 100644 --- a/firmware/export/config/sansaclipplus.h +++ b/firmware/export/config/sansaclipplus.h | |||
@@ -7,6 +7,8 @@ | |||
7 | #define MODEL_NAME "Sandisk Sansa Clip+" | 7 | #define MODEL_NAME "Sandisk Sansa Clip+" |
8 | #define FIRMWARE_OFFSET_FILE_DATA 8 | 8 | #define FIRMWARE_OFFSET_FILE_DATA 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 */ | ||
11 | #define HAVE_BOOTDATA | ||
10 | 12 | ||
11 | #define HAVE_MULTIDRIVE | 13 | #define HAVE_MULTIDRIVE |
12 | #define NUM_DRIVES 2 | 14 | #define NUM_DRIVES 2 |
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h index c7833189b6..cf3f90e363 100644 --- a/firmware/export/config/sansaclipv2.h +++ b/firmware/export/config/sansaclipv2.h | |||
@@ -7,6 +7,8 @@ | |||
7 | #define MODEL_NAME "Sandisk Sansa Clipv2" | 7 | #define MODEL_NAME "Sandisk Sansa Clipv2" |
8 | #define FIRMWARE_OFFSET_FILE_DATA 8 | 8 | #define FIRMWARE_OFFSET_FILE_DATA 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 */ | ||
11 | #define HAVE_BOOTDATA | ||
10 | 12 | ||
11 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL | 13 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL |
12 | 14 | ||
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h index 9adf7023a9..9f1ff1f206 100644 --- a/firmware/export/config/sansaclipzip.h +++ b/firmware/export/config/sansaclipzip.h | |||
@@ -7,6 +7,8 @@ | |||
7 | #define MODEL_NAME "Sandisk Sansa Zip" | 7 | #define MODEL_NAME "Sandisk Sansa Zip" |
8 | #define FIRMWARE_OFFSET_FILE_DATA 8 | 8 | #define FIRMWARE_OFFSET_FILE_DATA 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 */ | ||
11 | #define HAVE_BOOTDATA | ||
10 | 12 | ||
11 | #define HAVE_MULTIDRIVE | 13 | #define HAVE_MULTIDRIVE |
12 | #define NUM_DRIVES 2 | 14 | #define NUM_DRIVES 2 |
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config/sansafuze.h index 528e99080e..d674d1f88a 100644 --- a/firmware/export/config/sansafuze.h +++ b/firmware/export/config/sansafuze.h | |||
@@ -5,6 +5,8 @@ | |||
5 | /* For Rolo and boot loader */ | 5 | /* For Rolo and boot loader */ |
6 | #define MODEL_NUMBER 43 | 6 | #define MODEL_NUMBER 43 |
7 | #define MODEL_NAME "Sandisk Sansa Fuze" | 7 | #define MODEL_NAME "Sandisk Sansa Fuze" |
8 | /* Define if boot data from bootloader has been enabled for the target */ | ||
9 | #define HAVE_BOOTDATA | ||
8 | 10 | ||
9 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL | 11 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL |
10 | 12 | ||
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h index 595106eecf..a4d90160bd 100644 --- a/firmware/export/config/sansafuzev2.h +++ b/firmware/export/config/sansafuzev2.h | |||
@@ -5,6 +5,8 @@ | |||
5 | /* For Rolo and boot loader */ | 5 | /* For Rolo and boot loader */ |
6 | #define MODEL_NUMBER 68 | 6 | #define MODEL_NUMBER 68 |
7 | #define MODEL_NAME "Sandisk Sansa Fuze v2" | 7 | #define MODEL_NAME "Sandisk Sansa Fuze v2" |
8 | /* Define if boot data from bootloader has been enabled for the target */ | ||
9 | #define HAVE_BOOTDATA | ||
8 | 10 | ||
9 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL | 11 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL |
10 | 12 | ||
diff --git a/firmware/target/arm/crt0.S b/firmware/target/arm/crt0.S index b9cc27f5c5..07d860ed4f 100644 --- a/firmware/target/arm/crt0.S +++ b/firmware/target/arm/crt0.S | |||
@@ -21,6 +21,10 @@ | |||
21 | #include "config.h" | 21 | #include "config.h" |
22 | #include "cpu.h" | 22 | #include "cpu.h" |
23 | 23 | ||
24 | #if defined(HAVE_BOOTDATA) && !defined(BOOTLOADER) | ||
25 | #include "bootdata.h" | ||
26 | #endif | ||
27 | |||
24 | .section .init.text,"ax",%progbits | 28 | .section .init.text,"ax",%progbits |
25 | 29 | ||
26 | .global start | 30 | .global start |
@@ -137,6 +141,11 @@ newstart: | |||
137 | ldr ip, =main @ make sure we are using the virtual address | 141 | ldr ip, =main @ make sure we are using the virtual address |
138 | bx ip | 142 | bx ip |
139 | 143 | ||
144 | #if defined(HAVE_BOOTDATA) && !defined(BOOTLOADER) | ||
145 | /* boot data structure */ | ||
146 | put_boot_data_here | ||
147 | #endif | ||
148 | |||
140 | /* Cache-align interrupt stacks */ | 149 | /* Cache-align interrupt stacks */ |
141 | .balign 32 | 150 | .balign 32 |
142 | 151 | ||
@@ -149,4 +158,4 @@ irq_stack: | |||
149 | fiq_stack: | 158 | fiq_stack: |
150 | svc_stack: | 159 | svc_stack: |
151 | 160 | ||
152 | end: \ No newline at end of file | 161 | end: |