Move most rules to Makefile.common

[proxmark3-svn] / bootrom / Makefile

diff --git a/bootrom/Makefile b/bootrom/Makefile
index 652e0ae2587a7fe2a4434fe4a960704f79a0b468..2ab91286d90fde201ef02d661e1ab5efea707009 100644 (file)
--- a/bootrom/Makefile
+++ b/bootrom/Makefile
@@ -1,5 +1,4 @@
 # Makefile for bootrom, see ../common/Makefile.common for common settings\r
 # Makefile for bootrom, see ../common/Makefile.common for common settings\r

-include ../common/Makefile.common\r

 \r
 OBJJTAG = $(OBJDIR)/bootrom.o $(OBJDIR)/ram-reset.o $(OBJDIR)/usb.o\r
 OBJFLASH = $(OBJDIR)/flash-reset.o $(OBJDIR)/fromflash.o\r
 \r
 OBJJTAG = $(OBJDIR)/bootrom.o $(OBJDIR)/ram-reset.o $(OBJDIR)/usb.o\r
 OBJFLASH = $(OBJDIR)/flash-reset.o $(OBJDIR)/fromflash.o\r


@@ -7,8 +6,8 @@ OBJFLASH = $(OBJDIR)/flash-reset.o $(OBJDIR)/fromflash.o
 THUMBSRC = usb.c fromflash.c bootrom.c\r
 ASMSRC   = ram-reset.s flash-reset.s\r
 \r
 THUMBSRC = usb.c fromflash.c bootrom.c\r
 ASMSRC   = ram-reset.s flash-reset.s\r
 \r

-THUMBOBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(THUMBSRC))\r
-ASMOBJ   = $(patsubst %.s,$(OBJDIR)/%.o,$(ASMSRC))\r
+# Do not move this inclusion before the definition of {THUMB,ASM,ARM}{OBJ,SRC}\r
+include ../common/Makefile.common\r

 \r
 all: bootrom-merged.s19\r
 \r
 \r
 all: bootrom-merged.s19\r
 \r


@@ -21,20 +20,12 @@ $(OBJDIR)/bootrom.elf: $(OBJFLASH)
 $(OBJDIR)/bootrom-forjtag.elf: $(OBJJTAG)\r
        $(LD) -g -Tldscript-ram-jtag --oformat elf32-littlearm -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
 \r
 $(OBJDIR)/bootrom-forjtag.elf: $(OBJJTAG)\r
        $(LD) -g -Tldscript-ram-jtag --oformat elf32-littlearm -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
 \r

-$(OBJDIR)/%.s19: $(OBJDIR)/%.elf\r
-       $(OBJCOPY) -Osrec --srec-forceS3 $^ $@\r
-\r
-$(THUMBOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)\r
-       $(CC) $(CFLAGS) -mthumb -mthumb-interwork -o $@ $< \r
-\r
-$(ASMOBJ): $(OBJDIR)/%.o: %.s\r
-       $(CC) $(CFLAGS) -mthumb-interwork -o $@ $<\r
-\r

 clean:\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.o\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.elf\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.s19\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.map\r
 clean:\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.o\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.elf\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.s19\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.map\r

+       $(DELETE) $(OBJDIR)$(PATHSEP)*.d\r

        $(DELETE) bootrom-merged.s19\r
 \r
 .PHONY: all clean help\r
        $(DELETE) bootrom-merged.s19\r
 \r
 .PHONY: all clean help\r