summaryrefslogtreecommitdiff
path: root/bootloader/ipod.c
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-05-27 09:41:46 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-05-27 09:41:46 +0000
commit5d236b2bfda7b460e6b970c3b6f6dc539b14020e (patch)
tree27316274323f1de2f7da190f269061d1c4280847 /bootloader/ipod.c
parent6ca9f232a817ed6717354ae68812f67b08cbc2a9 (diff)
downloadrockbox-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/ipod.c')
-rw-r--r--bootloader/ipod.c6
1 files changed, 2 insertions, 4 deletions
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 */
57unsigned char *loadbuffer = (unsigned char *)DRAM_START; 58unsigned char *loadbuffer = (unsigned char *)DRAM_START;
58 59
59/* Bootloader version */
60char 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 */
64int timer_check(int clock_start, unsigned int usecs) 62int 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();