look for binary data in other data

[proxmark3-svn] / armsrc / Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index e8db3b31f9a8e5d39f64040446bc9aef6a88583a..8ad442f1aca4caa708380d296bbde16d4caa2dee 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -1,3 +1,4 @@
+PATH=..\..\devkitARM\bin;%PATH%\r
 CC     = arm-elf-gcc\r
 AS     = arm-elf-as\r
 LD     = arm-elf-ld\r
@@ -10,17 +11,21 @@ INCLUDE = -I../include
 INCLUDES = ../include/proxmark3.h ../include/at91sam7s128.h ../include/config_gpio.h ../include/usb_cmd.h apps.h\r
 LIB = "..\..\devkitARM\lib\gcc\arm-elf\4.1.0\interwork"\r
 \r
+# Add the "-DWITH_LCD" flag in CLFAGS to add support for LCD\r
+# and add OBJLCD to OBJ too\r
 CFLAGS = -O6 -c $(INCLUDE) -Wall\r
 \r
+OBJLCD = $(OBJDIR)/fonts.o \\r
+               $(OBJDIR)/LCD.o\r
+\r
 OBJ =  $(OBJDIR)/start.o \\r
                $(OBJDIR)/appmain.o \\r
                $(OBJDIR)/fpga.o \\r
+               $(OBJDIR)/lfops.o \\r
                $(OBJDIR)/iso14443.o \\r
                $(OBJDIR)/iso14443a.o \\r
                $(OBJDIR)/iso15693.o \\r
-               $(OBJDIR)/util.o \\r
-               $(OBJDIR)/fonts.o \\r
-               $(OBJDIR)/LCD.o\r
+               $(OBJDIR)/util.o\r
 \r
 OBJFPGA = \\r
                $(OBJDIR)/fpgaimg.o\r
@@ -32,12 +37,12 @@ all: osimage.s19
 \r
 $(OBJDIR)/fpgaimage.s19: $(OBJDIR)/fpgaimg.o\r
        @echo obj/fpgaimage.s19\r
-       @$(LD) -g -Tldscript-fpga -o $(OBJDIR)\fpgaimage.elf $(OBJDIR)/fpgaimg.o\r
+       @$(LD) -g -Tldscript-fpga -o $(OBJDIR)\fpgaimage.elf -Map=obj/fpgaimage.map $(OBJDIR)/fpgaimg.o\r
        @$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)\fpgaimage.elf $(OBJDIR)\fpgaimage.s19\r
 \r
 $(OBJDIR)/osimage.s19: $(OBJ) $(OBJCOMMON)\r
        @echo obj/osimage.s19\r
-       @$(LD) -g -Tldscript -o $(OBJDIR)\osimage.elf $(OBJ) $(OBJCOMMON) $(LIB)\libgcc.a\r
+       @$(LD) -g -Tldscript -o $(OBJDIR)\osimage.elf $(OBJ) $(OBJCOMMON) -Map=obj/osimage.map $(LIB)\libgcc.a\r
        @$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)\osimage.elf $(OBJDIR)\osimage.s19\r
 \r
 osimage.s19: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19\r