fix mandemod initialisation and add Transit tag trace

[proxmark3-svn] / armsrc / Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index ce1ad087d3b7021e06b1fee4afe4a8b0730d138d..bc15aeb9d568f48a6b8161dde7e06b20d04e4a6e 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -3,54 +3,55 @@
 APP_INCLUDES = apps.h\r
 \r
 # Add the "-DWITH_LCD" flag in APP_CLFAGS to add support for LCD\r
-# and add SRC_LCD to SRC_MAIN\r
+# and add SRC_LCD to THUMBSRC\r
 APP_CFLAGS     = -O6\r
 \r
 SRC_LCD = fonts.c LCD.c\r
 \r
-SRC_MAIN = start.c \\r
+THUMBSRC = start.c \\r
        appmain.c \\r
-       fpga.c \\r
        lfops.c \\r
        iso15693.c \\r
        util.c \\r
+       hitag2.c \\r
        usb.c\r
 \r
 # These are to be compiled in ARM mode\r
-SRC_MAIN_FAST =  iso14443.c \\r
-       iso14443a.c\r
+ARMSRC =  iso14443.c \\r
+       iso14443a.c \\r
+       fpgaloader.c\r
 \r
-SRC_FPGA = fpgaimg.c\r
-\r
-THUMBSRC = $(SRC_MAIN) $(SRC_FPGA)\r
-ARMSRC = $(SRC_MAIN_FAST)\r
-\r
-MAIN_OBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(SRC_MAIN) $(SRC_MAIN_FAST))\r
-\r
-# Do not move this inclusion before the definition of {THUMB,ASM,ARM}{OBJ,SRC}\r
+# Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC\r
 include ../common/Makefile.common\r
 \r
 all: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19\r
 \r
-$(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fpgaimg.o\r
-       $(LD) -g -Tldscript-fpga -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
+$(OBJDIR)/fpga.o: fpga.bit\r
+       $(OBJCOPY) -O elf32-littlearm -I binary -B arm --redefine-sym _binary____fpga_fpga_bit_start=_binary_fpga_bit_start --redefine-sym _binary____fpga_fpga_bit_end=_binary_fpga_bit_end --prefix-sections=fpga_bit  $^ $@\r
 \r
-$(OBJDIR)/osimage.elf: $(MAIN_OBJ) $(ARMLIB)/libgcc.a\r
+$(OBJDIR)/fullimage.elf: $(VERSIONOBJ) $(OBJDIR)/fpga.o $(THUMBOBJ) $(ARMOBJ) $(ARMLIB)/libgcc.a\r
        $(LD) -g -Tldscript -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
 \r
+$(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fullimage.elf\r
+       $(OBJCOPY) -F elf32-littlearm --only-section .fpgaimage $^ $@  \r
+\r
+$(OBJDIR)/osimage.elf: $(OBJDIR)/fullimage.elf\r
+       $(OBJCOPY) -F elf32-littlearm --remove-section .fpgaimage $^ $@\r
+\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) version.c\r
 \r
 .PHONY: all clean help\r
 help:\r
        @echo Multi-OS Makefile, you are running on $(DETECTED_OS)\r
        @echo Possible targets:\r
-       @echo + all           - Make both:\r
-       @echo + osimage.s19   - The OS image\r
-       @echo + fpgaimage.s19 - The FPGA image\r
-       @echo + clean         - Clean $(OBJDIR)\r
+       @echo + all               - Make both:\r
+       @echo + $(OBJDIR)/osimage.s19   - The OS image\r
+       @echo + $(OBJDIR)/fpgaimage.s19 - The FPGA image\r
+       @echo + clean             - Clean $(OBJDIR)\r
 \r