Skip to content

Commit 6a0915e

Browse files
Fl0-0pwpiwi
authored andcommitted
Bootrom version fix + .gitignore (#645)
* Fix bootrom Makefile * Add armsrc/fpga_version_info.c to .gitignore
1 parent dfdca20 commit 6a0915e

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
!client/hardnested/tables/*.z
1919
usb_cmd.lua
2020
version.c
21+
armsrc/fpga_version_info.c
2122
client/ui/ui_overlays.h
2223
*.Td
2324
.DS_Store

bootrom/Makefile

+6-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
ARMSRC =
1111
THUMBSRC = cmd.c usb_cdc.c bootrom.c
1212
ASMSRC = ram-reset.s flash-reset.s
13-
VERSIONSRC =
13+
VERSIONSRC = version.c
1414

1515
## There is a strange bug with the linker: Sometimes it will not emit the glue to call
1616
## BootROM from ARM mode. The symbol is emitted, but the section will be filled with
@@ -22,6 +22,11 @@ VERSIONSRC =
2222
# stdint.h provided locally until GCC 4.5 becomes C99 compliant
2323
APP_CFLAGS = -I.
2424

25+
# version.c should be remade on every compilation
26+
.PHONY: version.c
27+
version.c: default_version.c
28+
perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@
29+
2530
# Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
2631
include ../common/Makefile.common
2732

0 commit comments

Comments
 (0)