diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2010-05-27 09:41:46 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-05-27 09:41:46 +0000 |
commit | 5d236b2bfda7b460e6b970c3b6f6dc539b14020e (patch) | |
tree | 27316274323f1de2f7da190f269061d1c4280847 /bootloader/main-pp.c | |
parent | 6ca9f232a817ed6717354ae68812f67b08cbc2a9 (diff) | |
download | rockbox-5d236b2bfda7b460e6b970c3b6f6dc539b14020e.tar.gz rockbox-5d236b2bfda7b460e6b970c3b6f6dc539b14020e.zip |
Generate C file / header for svn version string
It's now easier to force rebuild of files depending on the svn revision
version.c/version.h are generated once with new tools/genversion.sh
Changes in the VCS are still not auto detected, so you'll have to remove
builddir/version.* if you want to change the string in your binaries
APPSVERSION is now called RBVERSION and is defined in the generated
header instead of being defined by the Makefiles
appsversion is now called rbversion (the plugin api number didn't change
since old modules are still binary compatible)
Change some bootloaders to use knwon-at-buildtime RBVERSION instead of
"%s" + rbversion
You'll need to run make clean to regenerate dependencies after the
removal of apps/version.h
To build binaries with a different version string, hand-edit
tools/version.sh or tools/genversion.sh (which calls the former)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26320 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader/main-pp.c')
-rw-r--r-- | bootloader/main-pp.c | 6 |
1 files changed, 2 insertions, 4 deletions
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(); |