X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/5ed5e418c96e5a22edd19185ca86560f5b8318a4..165b92dc3558e43e61c3625e748e15cb270e7ab3:/armsrc/Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 220c21fc..054f20b6 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -9,38 +9,33 @@
 APP_INCLUDES = apps.h
 
 #remove one of the following defines and comment out the relevant line
-#in the next section to remove that particular feature from compilation  
-APP_CFLAGS = -DWITH_ISO14443a_StandAlone \
+#in the next section to remove that particular feature from compilation.
+# NO space,TABs after the "\" sign.  
+APP_CFLAGS = -DWITH_CRC \
+			 -DON_DEVICE \
 			 -DWITH_LF \
-			 -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b -DWITH_ICLASS \
-			 -DWITH_LEGICRF -DWITH_HITAG -DWITH_CRC -DON_DEVICE -DWITH_HFSNOOP \
-#			 -DWITH_EMV \
-#			 -DWITH_LCD \
+			 -DWITH_HITAG \
+ 			 -DWITH_ISO15693 \
+			 -DWITH_LEGICRF \
+			 -DWITH_ISO14443b \
+			 -DWITH_ISO14443a \
+			 -DWITH_ICLASS \
+			 -DWITH_HFSNOOP \
+			 -DWITH_ISO14443a_StandAlone \
 			 -fno-strict-aliasing -ffunction-sections -fdata-sections
+### IMPORTANT -  move the commented variable below this line
+#			 -DWITH_LCD \
 
-#ifdef WITH_LCD			 
-#SRC_LCD = fonts.c LCD.c
-#endif
-
-#ifdef WITH_LF
+SRC_LCD = fonts.c LCD.c
 SRC_LF = lfops.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c
-#endif
-
 SRC_ISO15693 = iso15693.c iso15693tools.c
 SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c mifaresniff.c epa.c
 SRC_ISO14443b = iso14443b.c
 SRC_CRAPTO1 = crapto1.c crypto1.c des.c aes.c desfire_key.c desfire_crypto.c mifaredesfire.c
 SRC_CRC = iso14443crc.c crc.c crc16.c crc32.c 
-
-#ifdef WITH_EMV
 SRC_EMV = tlv.c emvdataels.c emvutil.c emvcmd.c 									 
-#endif
-#ifdef WITH_ICLASS
 SRC_ICLASS = iclass.c optimized_cipher.c
-#endif
-#ifdef WITH_LEGIC
 SRC_LEGIC = legicrf.c legic_prng.c
-#endif
 
 #the FPGA bitstream files. Note: order matters!
 FPGA_BITSTREAMS = fpga_lf.bit fpga_hf.bit
@@ -88,6 +83,8 @@ ARMSRC = fpgaloader.c \
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common
 
+COMMON_FLAGS =  -Os 
+
 OBJS = $(OBJDIR)/fullimage.s19 
 FPGA_COMPRESSOR = ../client/fpga_compress
 
@@ -123,7 +120,7 @@ $(OBJDIR)/fullimage.data.o: $(OBJDIR)/fullimage.data.bin.z
 	$(OBJCOPY) -O elf32-littlearm -I binary -B arm --rename-section .data=compressed_data $^ $@
 
 $(OBJDIR)/fullimage.elf: $(OBJDIR)/fullimage.nodata.o $(OBJDIR)/fullimage.data.o
-	$(CC) $(LDFLAGS) -Wl,-T,ldscript,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^
+	$(CC) $(LDFLAGS) -Wl,-T,ldscript,-e,_osimage_entry,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^
 
 tarbin: $(OBJS)
 	$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(OBJS:%=armsrc/%) $(OBJS:%.s19=armsrc/%.elf)