diff options
Diffstat (limited to 'bootloader')
-rw-r--r-- | bootloader/SOURCES | 2 | ||||
-rw-r--r-- | bootloader/x1000/main.c (renamed from bootloader/x1000.c) | 29 |
2 files changed, 4 insertions, 27 deletions
diff --git a/bootloader/SOURCES b/bootloader/SOURCES index 95836eb016..8a4358ca77 100644 --- a/bootloader/SOURCES +++ b/bootloader/SOURCES | |||
@@ -88,10 +88,10 @@ show_logo.c | |||
88 | sansaconnect.c | 88 | sansaconnect.c |
89 | show_logo.c | 89 | show_logo.c |
90 | #elif defined(FIIO_M3K) || defined(SHANLING_Q1) || defined(EROS_QN) | 90 | #elif defined(FIIO_M3K) || defined(SHANLING_Q1) || defined(EROS_QN) |
91 | x1000.c | ||
92 | x1000/boot.c | 91 | x1000/boot.c |
93 | x1000/gui.c | 92 | x1000/gui.c |
94 | x1000/install.c | 93 | x1000/install.c |
94 | x1000/main.c | ||
95 | x1000/recovery.c | 95 | x1000/recovery.c |
96 | x1000/utils.c | 96 | x1000/utils.c |
97 | #endif | 97 | #endif |
diff --git a/bootloader/x1000.c b/bootloader/x1000/main.c index bc56b8f822..c507b1d2c9 100644 --- a/bootloader/x1000.c +++ b/bootloader/x1000/main.c | |||
@@ -19,42 +19,19 @@ | |||
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | /* Unified bootloader for all X1000 targets. This is a bit messy. | 22 | #include "x1000bootloader.h" |
23 | * | ||
24 | * Features: | ||
25 | * - Text based user interface | ||
26 | * - USB mass storage access | ||
27 | * - Bootloader installation / backup / restore | ||
28 | * | ||
29 | * Possible future improvements: | ||
30 | * - Allow booting original firmware from the UI | ||
31 | */ | ||
32 | |||
33 | #include "system.h" | 23 | #include "system.h" |
34 | #include "core_alloc.h" | 24 | #include "core_alloc.h" |
35 | #include "kernel/kernel-internal.h" | 25 | #include "kernel/kernel-internal.h" |
36 | #include "i2c.h" | ||
37 | #include "power.h" | 26 | #include "power.h" |
38 | #include "lcd.h" | ||
39 | #include "font.h" | ||
40 | #include "backlight.h" | ||
41 | #include "backlight-target.h" | ||
42 | #include "button.h" | 27 | #include "button.h" |
43 | #include "storage.h" | 28 | #include "storage.h" |
44 | #include "file_internal.h" | ||
45 | #include "disk.h" | 29 | #include "disk.h" |
30 | #include "file_internal.h" | ||
46 | #include "usb.h" | 31 | #include "usb.h" |
47 | #include "rb-loader.h" | 32 | #include "i2c-x1000.h" |
48 | #include "loader_strerror.h" | ||
49 | #include "version.h" | ||
50 | #include "boot-x1000.h" | 33 | #include "boot-x1000.h" |
51 | #include "installer-x1000.h" | ||
52 | #include "x1000/x1000bootloader.h" | ||
53 | #include <stddef.h> | ||
54 | #include <stdbool.h> | 34 | #include <stdbool.h> |
55 | #include <string.h> | ||
56 | #include <stdio.h> | ||
57 | #include <stdarg.h> | ||
58 | 35 | ||
59 | void main(void) | 36 | void main(void) |
60 | { | 37 | { |