Bootrom version fix + .gitignore (#645)

* Fix bootrom Makefile

* Add armsrc/fpga_version_info.c to .gitignore

diff --git a/.gitignore b/.gitignore
index 85f92ea89135873f0c7580dda0259f959950120b..c551f7a2866efd42a5be32eace7a6ba31fefc7eb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@
 !client/hardnested/tables/*.z
 usb_cmd.lua
 version.c
 !client/hardnested/tables/*.z
 usb_cmd.lua
 version.c

+armsrc/fpga_version_info.c

 client/ui/ui_overlays.h
 *.Td
 .DS_Store
 client/ui/ui_overlays.h
 *.Td
 .DS_Store

diff --git a/bootrom/Makefile b/bootrom/Makefile
index 59c22aa2dc35b03952a3cb7a2f0ee62dec0f0f42..dd1e7e0830877d14d1870549f0d4620b9b1c2c93 100644 (file)
--- a/bootrom/Makefile
+++ b/bootrom/Makefile
@@ -10,7 +10,7 @@
 ARMSRC = 
 THUMBSRC = cmd.c usb_cdc.c bootrom.c
 ASMSRC = ram-reset.s flash-reset.s
 ARMSRC = 
 THUMBSRC = cmd.c usb_cdc.c bootrom.c
 ASMSRC = ram-reset.s flash-reset.s

-VERSIONSRC =
+VERSIONSRC = version.c

 
 ## There is a strange bug with the linker: Sometimes it will not emit the glue to call
 ## BootROM from ARM mode. The symbol is emitted, but the section will be filled with
 
 ## There is a strange bug with the linker: Sometimes it will not emit the glue to call
 ## BootROM from ARM mode. The symbol is emitted, but the section will be filled with


@@ -22,6 +22,11 @@ VERSIONSRC =
 # stdint.h provided locally until GCC 4.5 becomes C99 compliant
 APP_CFLAGS = -I.
 
 # stdint.h provided locally until GCC 4.5 becomes C99 compliant
 APP_CFLAGS = -I.
 

+# version.c should be remade on every compilation
+.PHONY: version.c
+version.c: default_version.c
+       perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@
+

 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common
 
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common