X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7e931bbd32c878f6795a9c07d70ee96df2f675b2..fb6e5aa8630a2d181bcc82d7a3b2b3108d57937f:/bootrom/Makefile

diff --git a/bootrom/Makefile b/bootrom/Makefile
index 652e0ae2..43e2533f 100644
--- a/bootrom/Makefile
+++ b/bootrom/Makefile
@@ -1,45 +1,28 @@
 # Makefile for bootrom, see ../common/Makefile.common for common settings
-include ../common/Makefile.common
-
-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 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
 
-THUMBOBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(THUMBSRC))
-ASMOBJ   = $(patsubst %.s,$(OBJDIR)/%.o,$(ASMSRC))
-
-all: bootrom-merged.s19
+# Do not move this inclusion before the definition of {THUMB,ASM,ARM}{OBJ,SRC}
+include ../common/Makefile.common
 
-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
+all: $(OBJDIR)/bootrom.s19
 
-$(OBJDIR)/bootrom.elf: $(OBJFLASH)
+$(OBJDIR)/bootrom.elf: $(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 $@ $^
-
-$(OBJDIR)/%.s19: $(OBJDIR)/%.elf
-	$(OBJCOPY) -Osrec --srec-forceS3 $^ $@
-
-$(THUMBOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)
-	$(CC) $(CFLAGS) -mthumb -mthumb-interwork -o $@ $< 
-
-$(ASMOBJ): $(OBJDIR)/%.o: %.s
-	$(CC) $(CFLAGS) -mthumb-interwork -o $@ $<
-
 clean:
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.o
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.elf
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.s19
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.map
-	$(DELETE) bootrom-merged.s19
+	$(DELETE) $(OBJDIR)$(PATHSEP)*.d
 
 .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)