summaryrefslogtreecommitdiff
path: root/bootloader
diff options
context:
space:
mode:
Diffstat (limited to 'bootloader')
-rw-r--r--bootloader/SOURCES2
-rw-r--r--bootloader/sansa_as3525.c4
-rw-r--r--bootloader/show_logo.c2
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
51show_logo.c 51show_logo.c
52#elif defined(CREATIVE_ZVx) 52#elif defined(CREATIVE_ZVx)
53creativezvm.c 53creativezvm.c
54#elif CONFIG_CPU==AS3525 54#elif CONFIG_CPU==AS3525 || CONFIG_CPU==AS3525v2
55sansa_as3525.c 55sansa_as3525.c
56show_logo.c 56show_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
38int show_logo(void); 38int show_logo(void);
39 39
40void main(void) __attribute__((naked, noreturn)); 40void main(void) __attribute__((noreturn));
41void main(void) 41void 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);