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 f0d9325acd5d13997f3f8baf0a0b2a97a447b07f..3862b4f7db4e9c9ea77b032664c719956d4c7508 100644 (file)
--- a/armsrc/Makefile.linux
+++ b/armsrc/Makefile.linux
@@ -1,13 +1,15 @@
 # This makefile needs to be edited to reflect the location
-# of your own arm-elf-gcc toolchain (LIB variable)
+# of your own arm-elf-gcc toolchain (ARMLIB variable)
 
 CC     = arm-elf-gcc
 AS     = arm-elf-as
 LD     = arm-elf-ld
 OBJCOPY = arm-elf-objcopy
 
-# Indicate where your gnuarm toolchain libgcc.a library is located:
-LIB = /usr/local/new/gnuarm-4.3.0/lib/gcc/arm-elf/4.3.0/interwork
+# Indicate where your gnuarm toolchain libgcc.a interworking library is located
+# or set $ARMLIB in your environment:
+#ARMLIB = /usr/local/lib/gcc/arm-elf/4.3.3/interwork
+
 
 # Add -DWITH_LCD to EXTRA_CFLAGS if you want support for LCD
 # in your firmware (add OBJLCD to OBJ too!)
@@ -30,6 +32,7 @@ OBJLCD = $(OBJDIR)/LCD.o\
 OBJ =  $(OBJDIR)/start.o \
                $(OBJDIR)/appmain.o \
                $(OBJDIR)/fpga.o \
+               $(OBJDIR)/lfops.o \
                $(OBJDIR)/iso15693.o \
                $(OBJDIR)/util.o
 
@@ -51,12 +54,12 @@ fpgaimage.s19: $(OBJFPGA)
 
 osimage.s19: $(OBJ) $(OBJFAST) $(OBJCOMMON)
        @echo osimage.s19
-       $(LD) -g -Tldscript -o $(OBJDIR)/osimage.elf $^ $(LIB)/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)
        @echo fullimage.s19
-       $(LD) -g -Tldscript-full -o $(OBJDIR)/fullimage.elf $^  $(LIB)/libgcc.a
+       $(LD) -g -Tldscript-full -o $(OBJDIR)/fullimage.elf $^  $(ARMLIB)/libgcc.a
        $(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/fullimage.elf fullimage.s19
 
 # Directives to put the *.o in the OBJDIR directory:
@@ -72,13 +75,15 @@ $(OBJFAST): $(OBJDIR)/%.o : %.c
 $(OBJCOMMON): $(OBJDIR)/%.o : ../common/%.c
        $(CC) $(CFLAGS) $< -o $@
 
-# Those do not work on the current firmware !
+flash-both: flash flash-fpga
+
 flash-fpga: fpgaimage.s19
        ../linux/flasher fpga fpgaimage.s19
 
 flash: osimage.s19
        ../linux/flasher os osimage.s19
 
+# Those do not work on the current firmware !
 jtag-flash-full: fullimage.s19
        ../../OpenOCD/openocd -c "halt; flash write_image fullimage.s19 0x00100000; halt; reset; resume; poll; exit"
 
@@ -89,6 +94,6 @@ jtag-flash: osimage.s19
        ../../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