X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/97a82e8f362e3731bf45a1f9b3598d5f0a3459b4..0fc0fca5830c9d1a430f40ff935fb399f91b8adc:/bootrom/Makefile

diff --git a/bootrom/Makefile b/bootrom/Makefile
index 652e0ae2..2ab91286 100644
--- a/bootrom/Makefile
+++ b/bootrom/Makefile
@@ -1,5 +1,4 @@
 # 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
@@ -7,8 +6,8 @@ OBJFLASH = $(OBJDIR)/flash-reset.o $(OBJDIR)/fromflash.o
 THUMBSRC = usb.c fromflash.c bootrom.c
 ASMSRC   = ram-reset.s flash-reset.s
 
-THUMBOBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(THUMBSRC))
-ASMOBJ   = $(patsubst %.s,$(OBJDIR)/%.o,$(ASMSRC))
+# Do not move this inclusion before the definition of {THUMB,ASM,ARM}{OBJ,SRC}
+include ../common/Makefile.common
 
 all: bootrom-merged.s19
 
@@ -21,20 +20,12 @@ $(OBJDIR)/bootrom.elf: $(OBJFLASH)
 $(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) $(OBJDIR)$(PATHSEP)*.d
 	$(DELETE) bootrom-merged.s19
 
 .PHONY: all clean help