diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2009-12-31 19:15:20 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2009-12-31 19:15:20 +0000 |
commit | 2392bb41996963c6683253114bdfb3174146e7dc (patch) | |
tree | 3846475be5d2ac2f472fbac22781868ab0b0c60e /bootloader | |
parent | 822abc12360900030323560b92a440f425b5641a (diff) | |
download | rockbox-2392bb41996963c6683253114bdfb3174146e7dc.tar.gz rockbox-2392bb41996963c6683253114bdfb3174146e7dc.zip |
FS#10047 : Clipv2
Reuse some code from Clip (LCD) and a lot of code from AS3525
Add a new CPU type : AS3525v2, identical to AS3525 except it's an ARMv5 (arm926-ejs)
SD code still not working
For an unknown reason LCD doesn't work anymore (to be investigated)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24131 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
-rw-r--r-- | bootloader/SOURCES | 2 | ||||
-rw-r--r-- | bootloader/sansa_as3525.c | 4 | ||||
-rw-r--r-- | bootloader/show_logo.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/bootloader/SOURCES b/bootloader/SOURCES index 19bc9591c2..04b48f8471 100644 --- a/bootloader/SOURCES +++ b/bootloader/SOURCES | |||
@@ -51,7 +51,7 @@ ondavx747.c | |||
51 | show_logo.c | 51 | show_logo.c |
52 | #elif defined(CREATIVE_ZVx) | 52 | #elif defined(CREATIVE_ZVx) |
53 | creativezvm.c | 53 | creativezvm.c |
54 | #elif CONFIG_CPU==AS3525 | 54 | #elif CONFIG_CPU==AS3525 || CONFIG_CPU==AS3525v2 |
55 | sansa_as3525.c | 55 | sansa_as3525.c |
56 | show_logo.c | 56 | show_logo.c |
57 | #elif defined(LYRE_PROTO1) | 57 | #elif defined(LYRE_PROTO1) |
diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c index 7e6ac2dddb..8d6090ed17 100644 --- a/bootloader/sansa_as3525.c +++ b/bootloader/sansa_as3525.c | |||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | int show_logo(void); | 38 | int show_logo(void); |
39 | 39 | ||
40 | void main(void) __attribute__((naked, noreturn)); | 40 | void main(void) __attribute__((noreturn)); |
41 | void main(void) | 41 | void main(void) |
42 | { | 42 | { |
43 | unsigned char* loadbuffer; | 43 | unsigned char* loadbuffer; |
@@ -58,7 +58,7 @@ void main(void) | |||
58 | button_init_device(); | 58 | button_init_device(); |
59 | int btn = button_read_device(); | 59 | int btn = button_read_device(); |
60 | 60 | ||
61 | #if !defined(SANSA_FUZE) && !defined(SANSA_CLIP) | 61 | #if !defined(SANSA_FUZE) && !defined(SANSA_CLIP) && !defined(SANSA_CLIPV2) |
62 | if (button_hold()) | 62 | if (button_hold()) |
63 | { | 63 | { |
64 | verbose = true; | 64 | verbose = true; |
diff --git a/bootloader/show_logo.c b/bootloader/show_logo.c index c0627aa423..90cf222067 100644 --- a/bootloader/show_logo.c +++ b/bootloader/show_logo.c | |||
@@ -41,7 +41,7 @@ int show_logo( void ) | |||
41 | lcd_clear_display(); | 41 | lcd_clear_display(); |
42 | lcd_setfont(FONT_SYSFIXED); | 42 | lcd_setfont(FONT_SYSFIXED); |
43 | 43 | ||
44 | #ifdef SANSA_CLIP | 44 | #if defined(SANSA_CLIP) || defined(SANSA_CLIPV2) |
45 | /* The top 16 lines of the Sansa Clip screen are yellow, and the bottom 48 | 45 | /* The top 16 lines of the Sansa Clip screen are yellow, and the bottom 48 |
46 | are blue, so we reverse the usual positioning */ | 46 | are blue, so we reverse the usual positioning */ |
47 | lcd_putsxy(TEXT_XPOS, 0, BOOT_VERSION); | 47 | lcd_putsxy(TEXT_XPOS, 0, BOOT_VERSION); |