X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/0fc0fca5830c9d1a430f40ff935fb399f91b8adc..022c8791c14841d9c32f19b8b06ef6651bdcbd15:/bootrom/Makefile

diff --git a/bootrom/Makefile b/bootrom/Makefile
index 2ab91286..f88b3cdd 100644
--- a/bootrom/Makefile
+++ b/bootrom/Makefile
@@ -1,36 +1,36 @@
 # Makefile for bootrom, see ../common/Makefile.common for common settings
 
-OBJJTAG = $(OBJDIR)/bootrom.o $(OBJDIR)/ram-reset.o $(OBJDIR)/usb.o
-OBJFLASH = $(OBJDIR)/flash-reset.o $(OBJDIR)/fromflash.o
-
-THUMBSRC = usb.c fromflash.c bootrom.c
-ASMSRC   = ram-reset.s flash-reset.s
-
-# Do not move this inclusion before the definition of {THUMB,ASM,ARM}{OBJ,SRC}
+# DO NOT use thumb mode in the phase 1 bootloader since that generates a section with glue code
+ARMSRC = fromflash.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: bootrom-merged.s19
+all: $(OBJDIR)/bootrom.s19
 
-bootrom-merged.s19: $(OBJDIR)/bootrom.s19 $(OBJDIR)/bootrom-forjtag.s19
-	perl ../tools/merge-srec.pl $(OBJDIR)/bootrom.s19 $(OBJDIR)/bootrom-forjtag.s19 > bootrom-merged.s19
-
-$(OBJDIR)/bootrom.elf: $(OBJFLASH)
+$(OBJDIR)/bootrom.elf: $(VERSIONOBJ) $(ASMOBJ) $(ARMOBJ) $(THUMBOBJ)
 	$(LD) -g -Tldscript-flash --oformat elf32-littlearm -Map=$(patsubst %.elf,%.map,$@) -o $@ $^
 
-$(OBJDIR)/bootrom-forjtag.elf: $(OBJJTAG)
-	$(LD) -g -Tldscript-ram-jtag --oformat elf32-littlearm -Map=$(patsubst %.elf,%.map,$@) -o $@ $^
-
 clean:
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.o
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.elf
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.s19
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.map
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.d
-	$(DELETE) bootrom-merged.s19
+	$(DELETE) version.c
 
-.PHONY: all clean help
+.PHONY: all clean help 
 help:
 	@echo Multi-OS Makefile, you are running on $(DETECTED_OS)
 	@echo Possible targets:
-	@echo +	all   - Make bootrom-merged.s19, the main bootrom
+	@echo +	all   - Make $(OBJDIR)/bootrom.s19, the main bootrom
 	@echo +	clean - Clean $(OBJDIR)