diff options
Diffstat (limited to 'bootloader')
-rw-r--r-- | bootloader/Makefile | 8 | ||||
-rw-r--r-- | bootloader/creativezvm.c | 3 | ||||
-rw-r--r-- | bootloader/gigabeat-s.c | 4 | ||||
-rw-r--r-- | bootloader/gigabeat.c | 5 | ||||
-rw-r--r-- | bootloader/iaudio_coldfire.c | 6 | ||||
-rw-r--r-- | bootloader/ipod.c | 6 | ||||
-rw-r--r-- | bootloader/ipodnano2g.c | 6 | ||||
-rw-r--r-- | bootloader/iriver_h1x0.c | 7 | ||||
-rw-r--r-- | bootloader/iriver_h300.c | 5 | ||||
-rw-r--r-- | bootloader/main-e200r-installer.c | 6 | ||||
-rw-r--r-- | bootloader/main-pp.c | 6 | ||||
-rw-r--r-- | bootloader/meizu_m3.c | 1 | ||||
-rw-r--r-- | bootloader/meizu_m6sl.c | 1 | ||||
-rw-r--r-- | bootloader/meizu_m6sp.c | 1 | ||||
-rw-r--r-- | bootloader/mini2440.c | 3 | ||||
-rw-r--r-- | bootloader/mpio_hd200.c | 5 | ||||
-rw-r--r-- | bootloader/mrobe500.c | 3 | ||||
-rw-r--r-- | bootloader/ondavx747.c | 3 | ||||
-rw-r--r-- | bootloader/samsung_yps3.c | 1 | ||||
-rw-r--r-- | bootloader/show_logo.c | 5 | ||||
-rw-r--r-- | bootloader/telechips.c | 5 | ||||
-rw-r--r-- | bootloader/tpj1022.c | 2 |
22 files changed, 37 insertions, 55 deletions
diff --git a/bootloader/Makefile b/bootloader/Makefile index 3272510051..07f347ee16 100644 --- a/bootloader/Makefile +++ b/bootloader/Makefile | |||
@@ -46,12 +46,8 @@ ifdef APPEXTRA | |||
46 | INCLUDES += $(patsubst %,-I%,$(subst :, ,$(APPEXTRA))) | 46 | INCLUDES += $(patsubst %,-I%,$(subst :, ,$(APPEXTRA))) |
47 | endif | 47 | endif |
48 | 48 | ||
49 | ifndef VERSION | 49 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(DEFINES) $(EXTRA_DEFINES) \ |
50 | VERSION=$(shell date +%y%m%d-%H%M) | 50 | -DMEM=${MEMORYSIZE} |
51 | endif | ||
52 | |||
53 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(DEFINES) \ | ||
54 | -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} | ||
55 | 51 | ||
56 | OBJS := $(SRC:%.c=$(OBJDIR)/%.o) | 52 | OBJS := $(SRC:%.c=$(OBJDIR)/%.o) |
57 | SOURCES = $(SRC) | 53 | SOURCES = $(SRC) |
diff --git a/bootloader/creativezvm.c b/bootloader/creativezvm.c index 6469de7c29..73968c3b3f 100644 --- a/bootloader/creativezvm.c +++ b/bootloader/creativezvm.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include "button.h" | 29 | #include "button.h" |
30 | #include "common.h" | 30 | #include "common.h" |
31 | #include "usb.h" | 31 | #include "usb.h" |
32 | #include "version.h" | ||
32 | 33 | ||
33 | 34 | ||
34 | static void load_fw(unsigned char* ptr, unsigned int len) | 35 | static void load_fw(unsigned char* ptr, unsigned int len) |
@@ -66,7 +67,7 @@ void main(void) | |||
66 | lcd_setfont(FONT_SYSFIXED); | 67 | lcd_setfont(FONT_SYSFIXED); |
67 | reset_screen(); | 68 | reset_screen(); |
68 | printf("Rockbox boot loader"); | 69 | printf("Rockbox boot loader"); |
69 | printf("Version %s", APPSVERSION); | 70 | printf("Version " RBVERSION); |
70 | 71 | ||
71 | ret = storage_init(); | 72 | ret = storage_init(); |
72 | if(ret) | 73 | if(ret) |
diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c index 7c429a9b65..dcff26c4de 100644 --- a/bootloader/gigabeat-s.c +++ b/bootloader/gigabeat-s.c | |||
@@ -35,11 +35,11 @@ | |||
35 | #include "font.h" | 35 | #include "font.h" |
36 | #include "lcd.h" | 36 | #include "lcd.h" |
37 | #include "usb-target.h" | 37 | #include "usb-target.h" |
38 | #include "version.h" | ||
38 | 39 | ||
39 | #define TAR_CHUNK 512 | 40 | #define TAR_CHUNK 512 |
40 | #define TAR_HEADER_SIZE 157 | 41 | #define TAR_HEADER_SIZE 157 |
41 | 42 | ||
42 | const char version[] = APPSVERSION; | ||
43 | /* Where files sent via MTP are stored */ | 43 | /* Where files sent via MTP are stored */ |
44 | static const char basedir[] = "/Content/0b00/00/"; | 44 | static const char basedir[] = "/Content/0b00/00/"; |
45 | /* Can use memory after vector table up to 0x01f00000 */ | 45 | /* Can use memory after vector table up to 0x01f00000 */ |
@@ -346,7 +346,7 @@ void main(void) | |||
346 | lcd_clear_display(); | 346 | lcd_clear_display(); |
347 | 347 | ||
348 | printf("Gigabeat S Rockbox Bootloader"); | 348 | printf("Gigabeat S Rockbox Bootloader"); |
349 | printf("Version %s", version); | 349 | printf("Version " RBVERSION); |
350 | 350 | ||
351 | /* Initialize KPP so we can poll the button states */ | 351 | /* Initialize KPP so we can poll the button states */ |
352 | button_init_device(); | 352 | button_init_device(); |
diff --git a/bootloader/gigabeat.c b/bootloader/gigabeat.c index 81c069469d..7a634b329c 100644 --- a/bootloader/gigabeat.c +++ b/bootloader/gigabeat.c | |||
@@ -45,11 +45,10 @@ | |||
45 | #include "usb.h" | 45 | #include "usb.h" |
46 | #include "mmu-arm.h" | 46 | #include "mmu-arm.h" |
47 | #include "rtc.h" | 47 | #include "rtc.h" |
48 | #include "version.h" | ||
48 | 49 | ||
49 | #include <stdarg.h> | 50 | #include <stdarg.h> |
50 | 51 | ||
51 | char version[] = APPSVERSION; | ||
52 | |||
53 | void shutdown(void) | 52 | void shutdown(void) |
54 | { | 53 | { |
55 | /* We need to gracefully spin down the disk to prevent clicks. */ | 54 | /* We need to gracefully spin down the disk to prevent clicks. */ |
@@ -174,7 +173,7 @@ void main(void) | |||
174 | verbose = true; | 173 | verbose = true; |
175 | 174 | ||
176 | printf("Rockbox boot loader"); | 175 | printf("Rockbox boot loader"); |
177 | printf("Version %s", version); | 176 | printf("Version " RBVERSION); |
178 | 177 | ||
179 | sleep(50); /* ATA seems to error without this pause */ | 178 | sleep(50); /* ATA seems to error without this pause */ |
180 | 179 | ||
diff --git a/bootloader/iaudio_coldfire.c b/bootloader/iaudio_coldfire.c index a3b318bbbc..5639a0e59b 100644 --- a/bootloader/iaudio_coldfire.c +++ b/bootloader/iaudio_coldfire.c | |||
@@ -42,6 +42,8 @@ | |||
42 | #include "power.h" | 42 | #include "power.h" |
43 | #include "powermgmt.h" | 43 | #include "powermgmt.h" |
44 | #include "file.h" | 44 | #include "file.h" |
45 | #include "version.h" | ||
46 | |||
45 | 47 | ||
46 | #include "pcf50606.h" | 48 | #include "pcf50606.h" |
47 | #include "common.h" | 49 | #include "common.h" |
@@ -58,8 +60,6 @@ int usb_screen(void) | |||
58 | return 0; | 60 | return 0; |
59 | } | 61 | } |
60 | 62 | ||
61 | char version[] = APPSVERSION; | ||
62 | |||
63 | /* Reset the cookie for the crt0 crash check */ | 63 | /* Reset the cookie for the crt0 crash check */ |
64 | inline void __reset_cookie(void) | 64 | inline void __reset_cookie(void) |
65 | { | 65 | { |
@@ -188,7 +188,7 @@ void main(void) | |||
188 | } | 188 | } |
189 | 189 | ||
190 | printf("Rockbox boot loader"); | 190 | printf("Rockbox boot loader"); |
191 | printf("Version %s", version); | 191 | printf("Version " RBVERSION); |
192 | 192 | ||
193 | check_battery(); | 193 | check_battery(); |
194 | 194 | ||
diff --git a/bootloader/ipod.c b/bootloader/ipod.c index ee555793d0..af4c1576bb 100644 --- a/bootloader/ipod.c +++ b/bootloader/ipod.c | |||
@@ -44,6 +44,7 @@ | |||
44 | #include "common.h" | 44 | #include "common.h" |
45 | #include "hwcompat.h" | 45 | #include "hwcompat.h" |
46 | #include "usb.h" | 46 | #include "usb.h" |
47 | #include "version.h" | ||
47 | 48 | ||
48 | #define XSC(X) #X | 49 | #define XSC(X) #X |
49 | #define SC(X) XSC(X) | 50 | #define SC(X) XSC(X) |
@@ -56,9 +57,6 @@ | |||
56 | /* A buffer to load the Linux kernel or Rockbox into */ | 57 | /* A buffer to load the Linux kernel or Rockbox into */ |
57 | unsigned char *loadbuffer = (unsigned char *)DRAM_START; | 58 | unsigned char *loadbuffer = (unsigned char *)DRAM_START; |
58 | 59 | ||
59 | /* Bootloader version */ | ||
60 | char version[] = APPSVERSION; | ||
61 | |||
62 | #if CONFIG_KEYPAD == IPOD_4G_PAD && !defined(IPOD_MINI) | 60 | #if CONFIG_KEYPAD == IPOD_4G_PAD && !defined(IPOD_MINI) |
63 | /* check if number of seconds has past */ | 61 | /* check if number of seconds has past */ |
64 | int timer_check(int clock_start, unsigned int usecs) | 62 | int timer_check(int clock_start, unsigned int usecs) |
@@ -335,7 +333,7 @@ void* main(void) | |||
335 | lcd_setfont(FONT_SYSFIXED); | 333 | lcd_setfont(FONT_SYSFIXED); |
336 | 334 | ||
337 | printf("Rockbox boot loader"); | 335 | printf("Rockbox boot loader"); |
338 | printf("Version: %s", version); | 336 | printf("Version: " RBVERSION); |
339 | printf("IPOD version: 0x%08x", IPOD_HW_REVISION); | 337 | printf("IPOD version: 0x%08x", IPOD_HW_REVISION); |
340 | 338 | ||
341 | i=ata_init(); | 339 | i=ata_init(); |
diff --git a/bootloader/ipodnano2g.c b/bootloader/ipodnano2g.c index 14b5bbce20..b2b2138f78 100644 --- a/bootloader/ipodnano2g.c +++ b/bootloader/ipodnano2g.c | |||
@@ -44,6 +44,7 @@ | |||
44 | #include "power.h" | 44 | #include "power.h" |
45 | #include "file.h" | 45 | #include "file.h" |
46 | #include "common.h" | 46 | #include "common.h" |
47 | #include "version.h" | ||
47 | 48 | ||
48 | /* Safety measure - maximum allowed firmware image size. | 49 | /* Safety measure - maximum allowed firmware image size. |
49 | The largest known current (October 2009) firmware is about 6.2MB so | 50 | The largest known current (October 2009) firmware is about 6.2MB so |
@@ -54,9 +55,6 @@ | |||
54 | /* The buffer to load the firmware into - use an uncached alias of 0x08000000 */ | 55 | /* The buffer to load the firmware into - use an uncached alias of 0x08000000 */ |
55 | unsigned char *loadbuffer = (unsigned char *)0x48000000; | 56 | unsigned char *loadbuffer = (unsigned char *)0x48000000; |
56 | 57 | ||
57 | /* Bootloader version */ | ||
58 | char version[] = APPSVERSION; | ||
59 | |||
60 | extern int line; | 58 | extern int line; |
61 | 59 | ||
62 | void fatal_error(void) | 60 | void fatal_error(void) |
@@ -209,7 +207,7 @@ void main(void) | |||
209 | lcd_setfont(FONT_SYSFIXED); | 207 | lcd_setfont(FONT_SYSFIXED); |
210 | 208 | ||
211 | printf("Rockbox boot loader"); | 209 | printf("Rockbox boot loader"); |
212 | printf("Version: %s", version); | 210 | printf("Version: " RBVERSION); |
213 | 211 | ||
214 | i = storage_init(); | 212 | i = storage_init(); |
215 | 213 | ||
diff --git a/bootloader/iriver_h1x0.c b/bootloader/iriver_h1x0.c index f16a5128c9..1afbafa830 100644 --- a/bootloader/iriver_h1x0.c +++ b/bootloader/iriver_h1x0.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include "eeprom_settings.h" | 46 | #include "eeprom_settings.h" |
47 | #include "rbunicode.h" | 47 | #include "rbunicode.h" |
48 | #include "common.h" | 48 | #include "common.h" |
49 | #include "version.h" | ||
49 | 50 | ||
50 | #include <stdarg.h> | 51 | #include <stdarg.h> |
51 | 52 | ||
@@ -58,8 +59,6 @@ | |||
58 | static bool recovery_mode = false; | 59 | static bool recovery_mode = false; |
59 | #endif | 60 | #endif |
60 | 61 | ||
61 | char version[] = APPSVERSION; | ||
62 | |||
63 | /* Reset the cookie for the crt0 crash check */ | 62 | /* Reset the cookie for the crt0 crash check */ |
64 | inline void __reset_cookie(void) | 63 | inline void __reset_cookie(void) |
65 | { | 64 | { |
@@ -254,7 +253,7 @@ void failsafe_menu(void) | |||
254 | extern int line; | 253 | extern int line; |
255 | 254 | ||
256 | reset_screen(); | 255 | reset_screen(); |
257 | printf("Bootloader %s", version); | 256 | printf("Bootloader " RBVERSION); |
258 | check_battery(); | 257 | check_battery(); |
259 | printf("========================="); | 258 | printf("========================="); |
260 | line += FAILSAFE_OPTIONS; | 259 | line += FAILSAFE_OPTIONS; |
@@ -502,7 +501,7 @@ void main(void) | |||
502 | lcd_setfont(FONT_SYSFIXED); | 501 | lcd_setfont(FONT_SYSFIXED); |
503 | 502 | ||
504 | printf("Rockbox boot loader"); | 503 | printf("Rockbox boot loader"); |
505 | printf("Version %s", version); | 504 | printf("Version " RBVERSION); |
506 | 505 | ||
507 | /* No need to wait here more because lcd_init and others already do that. */ | 506 | /* No need to wait here more because lcd_init and others already do that. */ |
508 | // sleep(HZ/50); /* Allow the button driver to check the buttons */ | 507 | // sleep(HZ/50); /* Allow the button driver to check the buttons */ |
diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c index d15efb9b72..893532cac7 100644 --- a/bootloader/iriver_h300.c +++ b/bootloader/iriver_h300.c | |||
@@ -47,6 +47,7 @@ | |||
47 | #include "common.h" | 47 | #include "common.h" |
48 | #include "rbunicode.h" | 48 | #include "rbunicode.h" |
49 | #include "isp1362.h" | 49 | #include "isp1362.h" |
50 | #include "version.h" | ||
50 | 51 | ||
51 | #include <stdarg.h> | 52 | #include <stdarg.h> |
52 | 53 | ||
@@ -55,8 +56,6 @@ | |||
55 | 56 | ||
56 | #define DRAM_START 0x31000000 | 57 | #define DRAM_START 0x31000000 |
57 | 58 | ||
58 | char version[] = APPSVERSION; | ||
59 | |||
60 | /* Reset the cookie for the crt0 crash check */ | 59 | /* Reset the cookie for the crt0 crash check */ |
61 | inline void __reset_cookie(void) | 60 | inline void __reset_cookie(void) |
62 | { | 61 | { |
@@ -210,7 +209,7 @@ void main(void) | |||
210 | lcd_setfont(FONT_SYSFIXED); | 209 | lcd_setfont(FONT_SYSFIXED); |
211 | 210 | ||
212 | printf("Rockbox boot loader"); | 211 | printf("Rockbox boot loader"); |
213 | printf("Version %s", version); | 212 | printf("Version " RBVERSION); |
214 | 213 | ||
215 | sleep(HZ/50); /* Allow the button driver to check the buttons */ | 214 | sleep(HZ/50); /* Allow the button driver to check the buttons */ |
216 | rec_button = ((button_status() & BUTTON_REC) == BUTTON_REC) | 215 | rec_button = ((button_status() & BUTTON_REC) == BUTTON_REC) |
diff --git a/bootloader/main-e200r-installer.c b/bootloader/main-e200r-installer.c index 0a7b56b1b6..defdea4574 100644 --- a/bootloader/main-e200r-installer.c +++ b/bootloader/main-e200r-installer.c | |||
@@ -39,9 +39,7 @@ | |||
39 | #include "i2c.h" | 39 | #include "i2c.h" |
40 | #include "backlight-target.h" | 40 | #include "backlight-target.h" |
41 | #include "power.h" | 41 | #include "power.h" |
42 | 42 | #include "version.h" | |
43 | /* Bootloader version */ | ||
44 | char version[] = APPSVERSION; | ||
45 | 43 | ||
46 | #define START_SECTOR_OF_ROM 1 | 44 | #define START_SECTOR_OF_ROM 1 |
47 | #define ROMSECTOR_TO_HACK 63 | 45 | #define ROMSECTOR_TO_HACK 63 |
@@ -116,7 +114,7 @@ void* main(void) | |||
116 | lcd_setfont(FONT_SYSFIXED); | 114 | lcd_setfont(FONT_SYSFIXED); |
117 | 115 | ||
118 | printf("Rockbox e200R installer"); | 116 | printf("Rockbox e200R installer"); |
119 | printf("Version: %s", version); | 117 | printf("Version: " RBVERSION); |
120 | printf(MODEL_NAME); | 118 | printf(MODEL_NAME); |
121 | printf(""); | 119 | printf(""); |
122 | 120 | ||
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c index 4f1fe2a4e1..37f42eda43 100644 --- a/bootloader/main-pp.c +++ b/bootloader/main-pp.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #include "crc32-mi4.h" | 39 | #include "crc32-mi4.h" |
40 | #include <string.h> | 40 | #include <string.h> |
41 | #include "power.h" | 41 | #include "power.h" |
42 | #include "version.h" | ||
42 | #if defined(SANSA_E200) || defined(PHILIPS_SA9200) | 43 | #if defined(SANSA_E200) || defined(PHILIPS_SA9200) |
43 | #include "i2c.h" | 44 | #include "i2c.h" |
44 | #include "backlight-target.h" | 45 | #include "backlight-target.h" |
@@ -95,9 +96,6 @@ extern int show_logo(void); | |||
95 | /* A buffer to load the original firmware or Rockbox into */ | 96 | /* A buffer to load the original firmware or Rockbox into */ |
96 | unsigned char *loadbuffer = (unsigned char *)DRAM_START; | 97 | unsigned char *loadbuffer = (unsigned char *)DRAM_START; |
97 | 98 | ||
98 | /* Bootloader version */ | ||
99 | char version[] = APPSVERSION; | ||
100 | |||
101 | /* Locations and sizes in hidden partition on Sansa */ | 99 | /* Locations and sizes in hidden partition on Sansa */ |
102 | #if (CONFIG_STORAGE & STORAGE_SD) | 100 | #if (CONFIG_STORAGE & STORAGE_SD) |
103 | #define PPMI_SECTOR_OFFSET 1024 | 101 | #define PPMI_SECTOR_OFFSET 1024 |
@@ -525,7 +523,7 @@ void* main(void) | |||
525 | lcd_setfont(FONT_SYSFIXED); | 523 | lcd_setfont(FONT_SYSFIXED); |
526 | 524 | ||
527 | printf("Rockbox boot loader"); | 525 | printf("Rockbox boot loader"); |
528 | printf("Version: %s", version); | 526 | printf("Version: " RBVERSION); |
529 | printf(MODEL_NAME); | 527 | printf(MODEL_NAME); |
530 | 528 | ||
531 | i=storage_init(); | 529 | i=storage_init(); |
diff --git a/bootloader/meizu_m3.c b/bootloader/meizu_m3.c index 61aa3cecbe..7c0a5bca2d 100644 --- a/bootloader/meizu_m3.c +++ b/bootloader/meizu_m3.c | |||
@@ -54,7 +54,6 @@ | |||
54 | #include "audiohw.h" | 54 | #include "audiohw.h" |
55 | #include "rtc.h" | 55 | #include "rtc.h" |
56 | 56 | ||
57 | char version[] = APPSVERSION; | ||
58 | #define LONG_DELAY 200000 | 57 | #define LONG_DELAY 200000 |
59 | #define SHORT_DELAY 50000 | 58 | #define SHORT_DELAY 50000 |
60 | #define PAUSE_DELAY 50000 | 59 | #define PAUSE_DELAY 50000 |
diff --git a/bootloader/meizu_m6sl.c b/bootloader/meizu_m6sl.c index 0b335bec8a..c230ec3c08 100644 --- a/bootloader/meizu_m6sl.c +++ b/bootloader/meizu_m6sl.c | |||
@@ -47,7 +47,6 @@ | |||
47 | 47 | ||
48 | #include <stdarg.h> | 48 | #include <stdarg.h> |
49 | 49 | ||
50 | char version[] = APPSVERSION; | ||
51 | #define LONG_DELAY 200000 | 50 | #define LONG_DELAY 200000 |
52 | #define SHORT_DELAY 50000 | 51 | #define SHORT_DELAY 50000 |
53 | #define PAUSE_DELAY 50000 | 52 | #define PAUSE_DELAY 50000 |
diff --git a/bootloader/meizu_m6sp.c b/bootloader/meizu_m6sp.c index 064d3fc8df..c57fe91b22 100644 --- a/bootloader/meizu_m6sp.c +++ b/bootloader/meizu_m6sp.c | |||
@@ -45,7 +45,6 @@ | |||
45 | 45 | ||
46 | #include <stdarg.h> | 46 | #include <stdarg.h> |
47 | 47 | ||
48 | char version[] = APPSVERSION; | ||
49 | #define LONG_DELAY 200000 | 48 | #define LONG_DELAY 200000 |
50 | #define SHORT_DELAY 50000 | 49 | #define SHORT_DELAY 50000 |
51 | #define PAUSE_DELAY 50000 | 50 | #define PAUSE_DELAY 50000 |
diff --git a/bootloader/mini2440.c b/bootloader/mini2440.c index d735084c6a..f4441c3730 100644 --- a/bootloader/mini2440.c +++ b/bootloader/mini2440.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include "dma-target.h" | 46 | #include "dma-target.h" |
47 | #include "uart-s3c2440.h" | 47 | #include "uart-s3c2440.h" |
48 | #include "led-mini2440.h" | 48 | #include "led-mini2440.h" |
49 | #include "version.h" | ||
49 | 50 | ||
50 | 51 | ||
51 | int main(void) | 52 | int main(void) |
@@ -78,7 +79,7 @@ int main(void) | |||
78 | verbose = true; | 79 | verbose = true; |
79 | 80 | ||
80 | printf("Rockbox boot loader"); | 81 | printf("Rockbox boot loader"); |
81 | printf("Version %s", APPSVERSION); | 82 | printf("Version " RBVERSION); |
82 | 83 | ||
83 | rc = storage_init(); | 84 | rc = storage_init(); |
84 | if(rc) | 85 | if(rc) |
diff --git a/bootloader/mpio_hd200.c b/bootloader/mpio_hd200.c index a031234b5a..8062f7ef22 100644 --- a/bootloader/mpio_hd200.c +++ b/bootloader/mpio_hd200.c | |||
@@ -43,6 +43,7 @@ | |||
43 | #include "file.h" | 43 | #include "file.h" |
44 | 44 | ||
45 | #include "common.h" | 45 | #include "common.h" |
46 | #include "version.h" | ||
46 | 47 | ||
47 | #include <stdarg.h> | 48 | #include <stdarg.h> |
48 | 49 | ||
@@ -78,8 +79,6 @@ int usb_screen(void) | |||
78 | return 0; | 79 | return 0; |
79 | } | 80 | } |
80 | 81 | ||
81 | char version[] = APPSVERSION; | ||
82 | |||
83 | static inline bool _charger_inserted(void) | 82 | static inline bool _charger_inserted(void) |
84 | { | 83 | { |
85 | return (GPIO1_READ & (1<<14)) ? false : true; | 84 | return (GPIO1_READ & (1<<14)) ? false : true; |
@@ -233,7 +232,7 @@ static void bootmenu(void) | |||
233 | /* backbone of menu */ | 232 | /* backbone of menu */ |
234 | /* run the loader */ | 233 | /* run the loader */ |
235 | printf("Rockbox boot loader"); | 234 | printf("Rockbox boot loader"); |
236 | printf("Ver: %s", version); | 235 | printf("Ver: " RBVERSION); |
237 | 236 | ||
238 | check_battery(); | 237 | check_battery(); |
239 | 238 | ||
diff --git a/bootloader/mrobe500.c b/bootloader/mrobe500.c index 9052cbdc3c..d6ca58e009 100644 --- a/bootloader/mrobe500.c +++ b/bootloader/mrobe500.c | |||
@@ -45,6 +45,7 @@ | |||
45 | #include "tsc2100.h" | 45 | #include "tsc2100.h" |
46 | #include "time.h" | 46 | #include "time.h" |
47 | #include "system-arm.h" | 47 | #include "system-arm.h" |
48 | #include "version.h" | ||
48 | 49 | ||
49 | void main(void) | 50 | void main(void) |
50 | { | 51 | { |
@@ -83,7 +84,7 @@ void main(void) | |||
83 | verbose = true; | 84 | verbose = true; |
84 | 85 | ||
85 | printf("Rockbox boot loader"); | 86 | printf("Rockbox boot loader"); |
86 | printf("Version %s", APPSVERSION); | 87 | printf("Version " RBVERSION); |
87 | 88 | ||
88 | /* Enter USB mode without USB thread */ | 89 | /* Enter USB mode without USB thread */ |
89 | if(usb_detect() == USB_INSERTED) | 90 | if(usb_detect() == USB_INSERTED) |
diff --git a/bootloader/ondavx747.c b/bootloader/ondavx747.c index 994f45d78d..4dfc78d58c 100644 --- a/bootloader/ondavx747.c +++ b/bootloader/ondavx747.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include "disk.h" | 33 | #include "disk.h" |
34 | #include "string.h" | 34 | #include "string.h" |
35 | #include "adc.h" | 35 | #include "adc.h" |
36 | #include "version.h" | ||
36 | 37 | ||
37 | extern int show_logo(void); | 38 | extern int show_logo(void); |
38 | extern void power_off(void); | 39 | extern void power_off(void); |
@@ -296,7 +297,7 @@ int main(void) | |||
296 | if(verbose) | 297 | if(verbose) |
297 | reset_screen(); | 298 | reset_screen(); |
298 | printf(MODEL_NAME" Rockbox Bootloader"); | 299 | printf(MODEL_NAME" Rockbox Bootloader"); |
299 | printf("Version "APPSVERSION); | 300 | printf("Version " RBVERSION); |
300 | 301 | ||
301 | #ifdef HAS_BUTTON_HOLD | 302 | #ifdef HAS_BUTTON_HOLD |
302 | if(button_hold()) | 303 | if(button_hold()) |
diff --git a/bootloader/samsung_yps3.c b/bootloader/samsung_yps3.c index 3cf5cb70ec..d4eff81e01 100644 --- a/bootloader/samsung_yps3.c +++ b/bootloader/samsung_yps3.c | |||
@@ -57,7 +57,6 @@ | |||
57 | #include "wmcodec.h" | 57 | #include "wmcodec.h" |
58 | #include "nand-target.h" | 58 | #include "nand-target.h" |
59 | 59 | ||
60 | char version[] = APPSVERSION; | ||
61 | #define LONG_DELAY 200000 | 60 | #define LONG_DELAY 200000 |
62 | #define SHORT_DELAY 50000 | 61 | #define SHORT_DELAY 50000 |
63 | #define PAUSE_DELAY 50000 | 62 | #define PAUSE_DELAY 50000 |
diff --git a/bootloader/show_logo.c b/bootloader/show_logo.c index 09c6dbd4aa..3273034d05 100644 --- a/bootloader/show_logo.c +++ b/bootloader/show_logo.c | |||
@@ -23,13 +23,14 @@ | |||
23 | #include "font.h" | 23 | #include "font.h" |
24 | #include <stdio.h> | 24 | #include <stdio.h> |
25 | #include <string.h> | 25 | #include <string.h> |
26 | #include "version.h" | ||
26 | 27 | ||
27 | #include "bitmaps/rockboxlogo.h" | 28 | #include "bitmaps/rockboxlogo.h" |
28 | 29 | ||
29 | #if LCD_WIDTH <= 128 | 30 | #if LCD_WIDTH <= 128 |
30 | #define BOOT_VERSION ("Boot " APPSVERSION) | 31 | #define BOOT_VERSION ("Boot " RBVERSION) |
31 | #else | 32 | #else |
32 | #define BOOT_VERSION ("Boot Ver. " APPSVERSION) | 33 | #define BOOT_VERSION ("Boot Ver. " RBVERSION) |
33 | #endif | 34 | #endif |
34 | 35 | ||
35 | /* Ensure TEXT_XPOS is >= 0 */ | 36 | /* Ensure TEXT_XPOS is >= 0 */ |
diff --git a/bootloader/telechips.c b/bootloader/telechips.c index 98f8bebc38..9e9e75c183 100644 --- a/bootloader/telechips.c +++ b/bootloader/telechips.c | |||
@@ -43,6 +43,7 @@ | |||
43 | #include "power.h" | 43 | #include "power.h" |
44 | #include "file.h" | 44 | #include "file.h" |
45 | #include "common.h" | 45 | #include "common.h" |
46 | #include "version.h" | ||
46 | 47 | ||
47 | /* Show the Rockbox logo - in show_logo.c */ | 48 | /* Show the Rockbox logo - in show_logo.c */ |
48 | extern int show_logo(void); | 49 | extern int show_logo(void); |
@@ -50,8 +51,6 @@ extern int show_logo(void); | |||
50 | /* Address to load main Rockbox image to */ | 51 | /* Address to load main Rockbox image to */ |
51 | #define LOAD_ADDRESS 0x20000000 /* DRAM_START */ | 52 | #define LOAD_ADDRESS 0x20000000 /* DRAM_START */ |
52 | 53 | ||
53 | char version[] = APPSVERSION; | ||
54 | |||
55 | extern int line; | 54 | extern int line; |
56 | 55 | ||
57 | #define MAX_LOAD_SIZE (8*1024*1024) /* Arbitrary, but plenty. */ | 56 | #define MAX_LOAD_SIZE (8*1024*1024) /* Arbitrary, but plenty. */ |
@@ -152,7 +151,7 @@ void* main(void) | |||
152 | available for loading the firmware. Otherwise display the debug screen. */ | 151 | available for loading the firmware. Otherwise display the debug screen. */ |
153 | #ifdef TCCBOOT | 152 | #ifdef TCCBOOT |
154 | printf("Rockbox boot loader"); | 153 | printf("Rockbox boot loader"); |
155 | printf("Version %s", version); | 154 | printf("Version " RBVERSION); |
156 | 155 | ||
157 | printf("ATA"); | 156 | printf("ATA"); |
158 | rc = storage_init(); | 157 | rc = storage_init(); |
diff --git a/bootloader/tpj1022.c b/bootloader/tpj1022.c index db709d1b58..159dcc63cd 100644 --- a/bootloader/tpj1022.c +++ b/bootloader/tpj1022.c | |||
@@ -39,8 +39,6 @@ | |||
39 | #include "file.h" | 39 | #include "file.h" |
40 | #include "common.h" | 40 | #include "common.h" |
41 | 41 | ||
42 | char version[] = APPSVERSION; | ||
43 | |||
44 | void* main(void) | 42 | void* main(void) |
45 | { | 43 | { |
46 | int i; | 44 | int i; |