From 988e4485a3515e20fc6a5a2a845647526e4aac2b Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Fri, 9 Oct 2009 12:58:40 +0000
Subject: [PATCH] Remove all RC bits from the ams bootloaders and mkamsboot.
 Also fix a compilation warning (I was 100% sure I did that already).

git-svn-id: svn://svn.rockbox.org/rockbox/branches/bootloader_ams_pp@23045 a1c6a512-1295-4272-9138-f99709370657
---
 bootloader/show_logo.c       | 2 +-
 rbutil/mkamsboot/Makefile    | 2 +-
 rbutil/mkamsboot/mkamsboot.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bootloader/show_logo.c b/bootloader/show_logo.c
index 02c30dd2bd..499d34cf54 100644
--- a/bootloader/show_logo.c
+++ b/bootloader/show_logo.c
@@ -33,7 +33,7 @@
 #endif
 
 #if (CONFIG_CPU == AS3525) /* for this release, hack the version number in */
-#define BOOT_VERSION ("Boot Ver. 1.0RC")
+#define BOOT_VERSION ("Boot Ver. 1.0")
 #else
 #if LCD_WIDTH <= 128
 #define BOOT_VERSION ("Boot " APPSVERSION)
diff --git a/rbutil/mkamsboot/Makefile b/rbutil/mkamsboot/Makefile
index f2df210675..80cbc70a53 100644
--- a/rbutil/mkamsboot/Makefile
+++ b/rbutil/mkamsboot/Makefile
@@ -3,7 +3,7 @@ CFLAGS=-I../../tools/ucl/include -Wall
 LIBUCL=../../tools/ucl/src/libucl$(RBARCH).a
 
 #change for releases
-APPVERSION=1.1RC
+APPVERSION=1.1
 
 ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN)
 OUTPUT=mkamsboot.exe
diff --git a/rbutil/mkamsboot/mkamsboot.c b/rbutil/mkamsboot/mkamsboot.c
index c2702ed54a..ba4b84d990 100644
--- a/rbutil/mkamsboot/mkamsboot.c
+++ b/rbutil/mkamsboot/mkamsboot.c
@@ -655,7 +655,7 @@ int main(int argc, char* argv[])
             rb_packedsize);
     fprintf(stderr, "[INFO] Dual-boot function size:  %d bytes\n",
             bootloader_sizes[sum.model]);
-    fprintf(stderr, "[INFO] UCL unpack function size: %u bytes\n",
+    fprintf(stderr, "[INFO] UCL unpack function size: %lu bytes\n",
             sizeof(nrv2e_d8));
 
     totalsize = total_size(sum.model, of_packedsize, rb_packedsize);