X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8a6aec16d8c21d3c57457e5ec00eb83f5242feba..24fe4dffb49ca5c50983c54f1b1d51028c06390d:/bootrom/Makefile?ds=inline

diff --git a/bootrom/Makefile b/bootrom/Makefile
index 30b55466..f88b3cdd 100644
--- a/bootrom/Makefile
+++ b/bootrom/Makefile
@@ -2,15 +2,22 @@
 
 # DO NOT use thumb mode in the phase 1 bootloader since that generates a section with glue code
 ARMSRC = fromflash.c 
-THUMBSRC = usb.c version.c bootrom.c
+THUMBSRC = usb.c bootrom.c
 ASMSRC = ram-reset.s flash-reset.s
 
+## 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
+## zeroes. As a temporary workaround, do not use thumb for the phase 2 bootloader
+## -- Henryk Plötz <henryk@ploetzli.ch> 2009-09-01
+ARMSRC := $(ARMSRC) $(THUMBSRC)
+THUMBSRC := 
+
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common
 
 all: $(OBJDIR)/bootrom.s19
 
-$(OBJDIR)/bootrom.elf: $(ASMOBJ) $(ARMOBJ) $(THUMBOBJ)
+$(OBJDIR)/bootrom.elf: $(VERSIONOBJ) $(ASMOBJ) $(ARMOBJ) $(THUMBOBJ)
 	$(LD) -g -Tldscript-flash --oformat elf32-littlearm -Map=$(patsubst %.elf,%.map,$@) -o $@ $^
 
 clean: