diff options
Diffstat (limited to 'bootloader/rocker_linux.c')
-rw-r--r-- | bootloader/rocker_linux.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/bootloader/rocker_linux.c b/bootloader/rocker_linux.c index 28a1d78487..a6d69d0e9d 100644 --- a/bootloader/rocker_linux.c +++ b/bootloader/rocker_linux.c | |||
@@ -51,14 +51,12 @@ | |||
51 | #if defined(AGPTEK_ROCKER) | 51 | #if defined(AGPTEK_ROCKER) |
52 | #define ICON_WIDTH 70 | 52 | #define ICON_WIDTH 70 |
53 | #define ICON_HEIGHT 70 | 53 | #define ICON_HEIGHT 70 |
54 | #define RBFILE "rockbox.rocker" | ||
55 | #define ICON_NAME bm_hibyicon | 54 | #define ICON_NAME bm_hibyicon |
56 | #define OF_NAME "HIBY PLAYER" | 55 | #define OF_NAME "HIBY PLAYER" |
57 | #include "bitmaps/hibyicon.h" | 56 | #include "bitmaps/hibyicon.h" |
58 | #elif defined(XDUOO_X3II) | 57 | #elif defined(XDUOO_X3II) |
59 | #define ICON_WIDTH 130 | 58 | #define ICON_WIDTH 130 |
60 | #define ICON_HEIGHT 130 | 59 | #define ICON_HEIGHT 130 |
61 | #define RBFILE "rockbox.x3ii" | ||
62 | #define ICON_NAME bm_hibyicon | 60 | #define ICON_NAME bm_hibyicon |
63 | #define OF_NAME "HIBY PLAYER" | 61 | #define OF_NAME "HIBY PLAYER" |
64 | #define BUTTON_UP BUTTON_OPTION | 62 | #define BUTTON_UP BUTTON_OPTION |
@@ -68,7 +66,6 @@ | |||
68 | #elif defined(XDUOO_X20) | 66 | #elif defined(XDUOO_X20) |
69 | #define ICON_WIDTH 130 | 67 | #define ICON_WIDTH 130 |
70 | #define ICON_HEIGHT 130 | 68 | #define ICON_HEIGHT 130 |
71 | #define RBFILE "rockbox.x20" | ||
72 | #define ICON_NAME bm_hibyicon | 69 | #define ICON_NAME bm_hibyicon |
73 | #define OF_NAME "HIBY PLAYER" | 70 | #define OF_NAME "HIBY PLAYER" |
74 | #define BUTTON_UP BUTTON_OPTION | 71 | #define BUTTON_UP BUTTON_OPTION |
@@ -78,7 +75,6 @@ | |||
78 | #elif defined(FIIO_M3K) | 75 | #elif defined(FIIO_M3K) |
79 | #define ICON_WIDTH 130 | 76 | #define ICON_WIDTH 130 |
80 | #define ICON_HEIGHT 130 | 77 | #define ICON_HEIGHT 130 |
81 | #define RBFILE "rockbox.fiiom3k" | ||
82 | #define ICON_NAME bm_fiioicon | 78 | #define ICON_NAME bm_fiioicon |
83 | #define BUTTON_LEFT BUTTON_PREV | 79 | #define BUTTON_LEFT BUTTON_PREV |
84 | #define BUTTON_RIGHT BUTTON_NEXT | 80 | #define BUTTON_RIGHT BUTTON_NEXT |
@@ -88,7 +84,6 @@ | |||
88 | #elif defined(EROS_Q) | 84 | #elif defined(EROS_Q) |
89 | #define ICON_WIDTH 130 | 85 | #define ICON_WIDTH 130 |
90 | #define ICON_HEIGHT 130 | 86 | #define ICON_HEIGHT 130 |
91 | #define RBFILE "rockbox.erosq" | ||
92 | #define ICON_NAME bm_hibyicon | 87 | #define ICON_NAME bm_hibyicon |
93 | #define OF_NAME "HIBY PLAYER" | 88 | #define OF_NAME "HIBY PLAYER" |
94 | #define BUTTON_UP BUTTON_SCROLL_BACK | 89 | #define BUTTON_UP BUTTON_SCROLL_BACK |
@@ -99,11 +94,12 @@ | |||
99 | #error "must define ICON_WIDTH/HEIGHT" | 94 | #error "must define ICON_WIDTH/HEIGHT" |
100 | #endif | 95 | #endif |
101 | 96 | ||
102 | #ifdef FIIO_M3K | 97 | #define BASE_DIR PIVOT_ROOT |
103 | #define BASE_DIR "/mnt" | 98 | //#ifdef FIIO_M3K |
104 | #else | 99 | //#define BASE_DIR "/mnt" |
105 | #define BASE_DIR "/mnt/sd_0" | 100 | //#else |
106 | #endif | 101 | //#define BASE_DIR "/mnt/sd_0" |
102 | //#endif | ||
107 | 103 | ||
108 | /* images */ | 104 | /* images */ |
109 | #include "bitmaps/rockboxicon.h" | 105 | #include "bitmaps/rockboxicon.h" |
@@ -631,9 +627,9 @@ int main(int argc, char **argv) | |||
631 | { | 627 | { |
632 | fflush(stdout); | 628 | fflush(stdout); |
633 | mount_storage(true); | 629 | mount_storage(true); |
634 | system("/bin/cp " BASE_DIR "/.rockbox/" RBFILE " /tmp"); | 630 | system("/bin/cp " BASE_DIR "/.rockbox/" BOOTFILE " /tmp"); |
635 | system("/bin/chmod +x /tmp/" RBFILE); | 631 | system("/bin/chmod +x /tmp/" BOOTFILE); |
636 | execl("/tmp/" RBFILE, RBFILE, NULL); | 632 | execl("/tmp/" BOOTFILE, BOOTFILE, NULL); |
637 | printf("execvp failed: %s\n", strerror(errno)); | 633 | printf("execvp failed: %s\n", strerror(errno)); |
638 | /* fallback to OF in case of failure */ | 634 | /* fallback to OF in case of failure */ |
639 | error_screen("Cannot boot Rockbox"); | 635 | error_screen("Cannot boot Rockbox"); |