summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bootloader/Makefile4
-rw-r--r--bootloader/main.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/bootloader/Makefile b/bootloader/Makefile
index 8a483c3191..c2bc54a6da 100644
--- a/bootloader/Makefile
+++ b/bootloader/Makefile
@@ -26,6 +26,10 @@ ifdef APPEXTRA
INCLUDES += -I$(APPEXTRA)
endif
+ifndef VERSION
+VERSION=$(shell date +%y%m%d-%H%M)
+endif
+
CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(DEFINES) \
-DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE}
diff --git a/bootloader/main.c b/bootloader/main.c
index c250815a6e..85ac144875 100644
--- a/bootloader/main.c
+++ b/bootloader/main.c
@@ -51,6 +51,8 @@ int usb_screen(void)
return 0;
}
+char version[] = APPSVERSION;
+
static void usb_enable(bool on)
{
and_l(~0x01000000, &GPIO_OUT); /* GPIO24 is the Cypress chip power */
@@ -216,7 +218,8 @@ void main(void)
lcd_setfont(FONT_SYSFIXED);
- lcd_puts(0, line++, "Rockboot version CVS");
+ snprintf(buf, sizeof(buf), "Rockboot version %s", version);
+ lcd_puts(0, line++, buf);
lcd_update();
sleep(HZ/50); /* Allow the button driver to check the buttons */