Index: bootloader/main-pp.c =================================================================== --- bootloader/main-pp.c (revision 14038) +++ bootloader/main-pp.c (working copy) @@ -53,8 +53,9 @@ /* A buffer to load the original firmware or Rockbox into */ unsigned char *loadbuffer = (unsigned char *)DRAM_START; -/* Bootloader version */ -char version[] = APPSVERSION; +/* Bootloader version incl RBBLver magic for easy location in the binary */ +char _version_rbutil[] = "RBBLver"APPSVERSION"RBBLver"; +const char *version = _version_rbutil+7; /* Locations and sizes in hidden partition on Sansa */ #ifdef SANSA_E200 Index: bootloader/gigabeat.c =================================================================== --- bootloader/gigabeat.c (revision 14038) +++ bootloader/gigabeat.c (working copy) @@ -45,7 +45,9 @@ #include -char version[] = APPSVERSION; +/* Bootloader version incl RBBLver magic for easy location in the binary */ +char _version_rbutil[] = "RBBLver"APPSVERSION"RBBLver"; +const char *version = _version_rbutil+7; void main(void) { Index: bootloader/main.c =================================================================== --- bootloader/main.c (revision 14038) +++ bootloader/main.c (working copy) @@ -56,7 +56,9 @@ static bool recovery_mode = false; #endif -char version[] = APPSVERSION; +/* Bootloader version incl RBBLver magic for easy location in the binary */ +char _version_rbutil[] = "RBBLver"APPSVERSION"RBBLver"; +const char *version = _version_rbutil+7; /* Reset the cookie for the crt0 crash check */ inline void __reset_cookie(void) Index: bootloader/iaudio_x5.c =================================================================== --- bootloader/iaudio_x5.c (revision 14038) +++ bootloader/iaudio_x5.c (working copy) @@ -55,7 +55,9 @@ return 0; } -char version[] = APPSVERSION; +/* Bootloader version incl RBBLver magic for easy location in the binary */ +char _version_rbutil[] = "RBBLver"APPSVERSION"RBBLver"; +const char *version = _version_rbutil+7; /* Reset the cookie for the crt0 crash check */ inline void __reset_cookie(void) Index: bootloader/iriver_h300.c =================================================================== --- bootloader/iriver_h300.c (revision 14038) +++ bootloader/iriver_h300.c (working copy) @@ -53,7 +53,9 @@ #define DRAM_START 0x31000000 -char version[] = APPSVERSION; +/* Bootloader version incl RBBLver magic for easy location in the binary */ +char _version_rbutil[] = "RBBLver"APPSVERSION"RBBLver"; +const char *version = _version_rbutil+7; /* Reset the cookie for the crt0 crash check */ inline void __reset_cookie(void) Index: bootloader/ipod.c =================================================================== --- bootloader/ipod.c (revision 14038) +++ bootloader/ipod.c (working copy) @@ -53,8 +53,9 @@ /* A buffer to load the Linux kernel or Rockbox into */ unsigned char *loadbuffer = (unsigned char *)DRAM_START; -/* Bootloader version */ -char version[] = APPSVERSION; +/* Bootloader version incl RBBLver magic for easy location in the binary */ +char _version_rbutil[] = "RBBLver"APPSVERSION"RBBLver"; +const char *version = _version_rbutil+7; #define BUTTON_LEFT 1 #define BUTTON_MENU 2