diff options
| author | Nils Wallménius <nils@rockbox.org> | 2009-03-17 20:05:03 +0000 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2009-03-17 20:05:03 +0000 |
| commit | 6ce98bda11c26f209c8319213677dd411a9713b7 (patch) | |
| tree | b58c1068e4d5f26c0b6741fc15233eabda9b571a /firmware/export | |
| parent | 877efe1123d85ed60e54cd214ef044f64c06c735 (diff) | |
| download | rockbox-6ce98bda11c26f209c8319213677dd411a9713b7.tar.gz rockbox-6ce98bda11c26f209c8319213677dd411a9713b7.zip | |
FS#10018 general pp bootloader: start the OF if loading rockbox fails. Resolves a bug where the c200 bootloader would loop flashing the logo if loading rockbox failed and drop support for loading old .e200 and .h10 rockbox main binaries for the e200 resp h10, affects e200, c200, h10 (both kinds) and mrobe 100.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20342 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
| -rw-r--r-- | firmware/export/config-e200.h | 1 | ||||
| -rw-r--r-- | firmware/export/config-h10.h | 1 | ||||
| -rw-r--r-- | firmware/export/config-h10_5gb.h | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h index e4d4b739bc..fd481d9e63 100644 --- a/firmware/export/config-e200.h +++ b/firmware/export/config-e200.h | |||
| @@ -187,7 +187,6 @@ | |||
| 187 | #define MI4_FORMAT | 187 | #define MI4_FORMAT |
| 188 | #define BOOTFILE_EXT "mi4" | 188 | #define BOOTFILE_EXT "mi4" |
| 189 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 189 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
| 190 | #define OLD_BOOTFILE "rockbox.e200" | ||
| 191 | #define BOOTDIR "/.rockbox" | 190 | #define BOOTDIR "/.rockbox" |
| 192 | 191 | ||
| 193 | #define ICODE_ATTR_TREMOR_NOT_MDCT | 192 | #define ICODE_ATTR_TREMOR_NOT_MDCT |
diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h index 756b4da0ea..011c1316de 100644 --- a/firmware/export/config-h10.h +++ b/firmware/export/config-h10.h | |||
| @@ -177,7 +177,6 @@ | |||
| 177 | #define MI4_FORMAT | 177 | #define MI4_FORMAT |
| 178 | #define BOOTFILE_EXT "mi4" | 178 | #define BOOTFILE_EXT "mi4" |
| 179 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 179 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
| 180 | #define OLD_BOOTFILE "rockbox.h10" | ||
| 181 | #define BOOTDIR "/.rockbox" | 180 | #define BOOTDIR "/.rockbox" |
| 182 | 181 | ||
| 183 | #define ICODE_ATTR_TREMOR_NOT_MDCT | 182 | #define ICODE_ATTR_TREMOR_NOT_MDCT |
diff --git a/firmware/export/config-h10_5gb.h b/firmware/export/config-h10_5gb.h index 3a52823fd5..ef53e02ab4 100644 --- a/firmware/export/config-h10_5gb.h +++ b/firmware/export/config-h10_5gb.h | |||
| @@ -157,7 +157,6 @@ | |||
| 157 | #define MI4_FORMAT | 157 | #define MI4_FORMAT |
| 158 | #define BOOTFILE_EXT "mi4" | 158 | #define BOOTFILE_EXT "mi4" |
| 159 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 159 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
| 160 | #define OLD_BOOTFILE "rockbox.h10" | ||
| 161 | #define BOOTDIR "/.rockbox" | 160 | #define BOOTDIR "/.rockbox" |
| 162 | 161 | ||
| 163 | #define ICODE_ATTR_TREMOR_NOT_MDCT | 162 | #define ICODE_ATTR_TREMOR_NOT_MDCT |