diff options
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 show_logo.c #elif defined(CREATIVE_ZVx) creativezvm.c -#elif CONFIG_CPU==AS3525 +#elif CONFIG_CPU==AS3525 || CONFIG_CPU==AS3525v2 sansa_as3525.c show_logo.c #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 @@ int show_logo(void); -void main(void) __attribute__((naked, noreturn)); +void main(void) __attribute__((noreturn)); void main(void) { unsigned char* loadbuffer; @@ -58,7 +58,7 @@ void main(void) button_init_device(); int btn = button_read_device(); -#if !defined(SANSA_FUZE) && !defined(SANSA_CLIP) +#if !defined(SANSA_FUZE) && !defined(SANSA_CLIP) && !defined(SANSA_CLIPV2) if (button_hold()) { 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 ) lcd_clear_display(); lcd_setfont(FONT_SYSFIXED); -#ifdef SANSA_CLIP +#if defined(SANSA_CLIP) || defined(SANSA_CLIPV2) /* The top 16 lines of the Sansa Clip screen are yellow, and the bottom 48 are blue, so we reverse the usual positioning */ lcd_putsxy(TEXT_XPOS, 0, BOOT_VERSION); |