From: Fl0-0 Date: Tue, 7 Aug 2018 07:23:11 +0000 (+0200) Subject: Bootrom version fix + .gitignore (#645) X-Git-Tag: v3.1.0~32 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/6a0915eac23a40d8ca0bdcaa5203164a7fb16e0e Bootrom version fix + .gitignore (#645) * Fix bootrom Makefile * Add armsrc/fpga_version_info.c to .gitignore --- diff --git a/.gitignore b/.gitignore index 85f92ea8..c551f7a2 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ !client/hardnested/tables/*.z usb_cmd.lua version.c +armsrc/fpga_version_info.c client/ui/ui_overlays.h *.Td .DS_Store diff --git a/bootrom/Makefile b/bootrom/Makefile index 59c22aa2..dd1e7e08 100644 --- 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 -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 @@ -22,6 +22,11 @@ VERSIONSRC = # 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