summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Purchase <shotofadds@rockbox.org>2008-11-17 21:16:00 +0000
committerRob Purchase <shotofadds@rockbox.org>2008-11-17 21:16:00 +0000
commit9f0fbec9993f7b114f7bb2a29a027b3b612004bd (patch)
treee5bcdef06f2c7963a5f3a93627c84c631226a79a
parentde89a00cca2b50a4532e8fffdca38fd0816a6a03 (diff)
downloadrockbox-9f0fbec9993f7b114f7bb2a29a027b3b612004bd.tar.gz
rockbox-9f0fbec9993f7b114f7bb2a29a027b3b612004bd.zip
Show the Rockbox logo in the Telechips bootloader.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19129 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--bootloader/SOURCES1
-rw-r--r--bootloader/common.c2
-rw-r--r--bootloader/telechips.c7
3 files changed, 6 insertions, 4 deletions
diff --git a/bootloader/SOURCES b/bootloader/SOURCES
index 1bb3a90c13..67c0d0eb74 100644
--- a/bootloader/SOURCES
+++ b/bootloader/SOURCES
@@ -33,6 +33,7 @@ iriver_h300.c
33mrobe500.c 33mrobe500.c
34#elif defined(CPU_TCC77X) || defined(CPU_TCC780X) 34#elif defined(CPU_TCC77X) || defined(CPU_TCC780X)
35telechips.c 35telechips.c
36show_logo.c
36#elif defined(MEIZU_M6SL) 37#elif defined(MEIZU_M6SL)
37meizu_m6sl.c 38meizu_m6sl.c
38#elif defined(MEIZU_M6SP) 39#elif defined(MEIZU_M6SP)
diff --git a/bootloader/common.c b/bootloader/common.c
index 906b5e0af7..ae6003cddf 100644
--- a/bootloader/common.c
+++ b/bootloader/common.c
@@ -34,7 +34,7 @@
34 on a button press - currently only the ipod, H10 and Sansa versions do. */ 34 on a button press - currently only the ipod, H10 and Sansa versions do. */
35#if defined(IPOD_ARCH) || defined(IRIVER_H10) || defined(IRIVER_H10_5GB) \ 35#if defined(IPOD_ARCH) || defined(IRIVER_H10) || defined(IRIVER_H10_5GB) \
36 || defined(SANSA_E200) || defined(SANSA_C200) || defined(GIGABEAT_F) \ 36 || defined(SANSA_E200) || defined(SANSA_C200) || defined(GIGABEAT_F) \
37 || defined(PHILIPS_SA9200) || (CONFIG_CPU == AS3525) 37 || defined(PHILIPS_SA9200) || (CONFIG_CPU == AS3525) || defined(COWON_D2)
38bool verbose = false; 38bool verbose = false;
39#else 39#else
40bool verbose = true; 40bool verbose = true;
diff --git a/bootloader/telechips.c b/bootloader/telechips.c
index 4d64532449..f5abb8c919 100644
--- a/bootloader/telechips.c
+++ b/bootloader/telechips.c
@@ -44,9 +44,8 @@
44#include "file.h" 44#include "file.h"
45#include "common.h" 45#include "common.h"
46 46
47#if defined(COWON_D2) || defined(IAUDIO_7) 47/* Show the Rockbox logo - in show_logo.c */
48#include "pcf50606.h" 48extern int show_logo(void);
49#endif
50 49
51/* Address to load main Rockbox image to */ 50/* Address to load main Rockbox image to */
52#define LOAD_ADDRESS 0x20000000 /* DRAM_START */ 51#define LOAD_ADDRESS 0x20000000 /* DRAM_START */
@@ -196,6 +195,8 @@ void* main(void)
196 195
197 font_init(); 196 font_init();
198 lcd_setfont(FONT_SYSFIXED); 197 lcd_setfont(FONT_SYSFIXED);
198
199 show_logo();
199 200
200 _backlight_on(); 201 _backlight_on();
201 202