Add checks in em4x50read to avoid segfaults in case loops go over the GraphTraceLen.

[proxmark3-svn] / armsrc / Makefile.linux

diff --git a/armsrc/Makefile.linux b/armsrc/Makefile.linux
index 897a6b121cfed1c07a5adc0442f2440dbcaa06ca..3862b4f7db4e9c9ea77b032664c719956d4c7508 100644 (file)
--- a/armsrc/Makefile.linux
+++ b/armsrc/Makefile.linux
@@ -32,6 +32,7 @@ OBJLCD = $(OBJDIR)/LCD.o\
 OBJ =  $(OBJDIR)/start.o \
                $(OBJDIR)/appmain.o \
                $(OBJDIR)/fpga.o \
 OBJ =  $(OBJDIR)/start.o \
                $(OBJDIR)/appmain.o \
                $(OBJDIR)/fpga.o \

+               $(OBJDIR)/lfops.o \

                $(OBJDIR)/iso15693.o \
                $(OBJDIR)/util.o
 
                $(OBJDIR)/iso15693.o \
                $(OBJDIR)/util.o
 


@@ -53,7 +54,7 @@ fpgaimage.s19: $(OBJFPGA)
 
 osimage.s19: $(OBJ) $(OBJFAST) $(OBJCOMMON)
        @echo osimage.s19
 
 osimage.s19: $(OBJ) $(OBJFAST) $(OBJCOMMON)
        @echo osimage.s19

-       $(LD) -g -Tldscript -o $(OBJDIR)/osimage.elf $^ $(ARMLIB)/libgcc.a
+       $(LD) -g -Tldscript -o $(OBJDIR)/osimage.elf -Map=osimage.map $^ $(ARMLIB)/libgcc.a

        $(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/osimage.elf osimage.s19
 
 fullimage.s19: $(OBJ) $(OBJFAST) $(OBJCOMMON) $(OBJFAST) $(OBJFPGA)
        $(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/osimage.elf osimage.s19
 
 fullimage.s19: $(OBJ) $(OBJFAST) $(OBJCOMMON) $(OBJFAST) $(OBJFPGA)


@@ -93,6 +94,6 @@ jtag-flash: osimage.s19
        ../../OpenOCD/openocd -c "halt; flash write_image osimage.s19 0x00100000; halt; reset; resume; poll; exit"
 
 clean:
        ../../OpenOCD/openocd -c "halt; flash write_image osimage.s19 0x00100000; halt; reset; resume; poll; exit"
 
 clean:

-       rm -f $(OBJDIR)/*.o $(OBJDIR)/*.elf *.s19
+       rm -f $(OBJDIR)/*.o $(OBJDIR)/*.elf *.s19 osimage.map

 
 .PHONY: all clean
 
 .PHONY: all clean