CHG: some minor adjustments.

[proxmark3-svn] / armsrc / Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 36113ebeca9869ece7e812777fb957a6c9447462..c5a698bdafda45c68890caa0a2f66e472bf2bf5b 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -10,18 +10,36 @@ 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  
 
 #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 -DWITH_LF -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b -DWITH_ICLASS -DWITH_LEGICRF -DWITH_HITAG  -DWITH_CRC -DON_DEVICE -DWITH_HFSNOOP \
-                               -fno-strict-aliasing -ffunction-sections -fdata-sections
-#-DWITH_LCD 
+APP_CFLAGS = -DWITH_ISO14443a_StandAlone \
+                        -DWITH_LF \
+                        -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b -DWITH_ICLASS \
+                        -DWITH_LEGICRF -DWITH_HITAG -DWITH_CRC -DON_DEVICE -DWITH_HFSNOOP \
+#                       -DWITH_LCD \
+                        -fno-strict-aliasing -ffunction-sections -fdata-sections
+
+#ifdef WITH_LCD                         
+SRC_LCD = fonts.c LCD.c
+#endif
+
+#ifdef WITH_LF
+SRC_LF = lfops.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c
+#endif

 
 

-#SRC_LCD = fonts.c LCD.c
-SRC_LF = lfops.c hitag2.c lfsampling.c pcf7931.c lfdemod.c protocols.c

 SRC_ISO15693 = iso15693.c iso15693tools.c
 SRC_ISO15693 = iso15693.c iso15693tools.c

-SRC_ISO14443a = epa.c iso14443a.c mifareutil.c mifarecmd.c mifaresniff.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 
 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                                                                         
 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
 
 #the FPGA bitstream files. Note: order matters!
 FPGA_BITSTREAMS = fpga_lf.bit fpga_hf.bit


@@ -39,35 +57,38 @@ APP_CFLAGS += -I.
 
 # Compile these in thumb mode (small size)
 THUMBSRC = start.c \
 
 # Compile these in thumb mode (small size)
 THUMBSRC = start.c \

+       protocols.c \

        $(SRC_LCD) \
        $(SRC_ISO15693) \
        $(SRC_LF) \
        $(SRC_ZLIB) \
        $(SRC_LCD) \
        $(SRC_ISO15693) \
        $(SRC_LF) \
        $(SRC_ZLIB) \

+       $(SRC_LEGIC) \

        appmain.c \
        printf.c \
        util.c \
        string.c \
        appmain.c \
        printf.c \
        util.c \
        string.c \

-       usb_cdc.c \
-       cmd.c
+       BigBuf.c \
+       ticks.c \
+       random.c \
+       hfsnoop.c

 
 # These are to be compiled in ARM mode
 ARMSRC = fpgaloader.c \
 
 # These are to be compiled in ARM mode
 ARMSRC = fpgaloader.c \

-       legicrf.c \

        $(SRC_ISO14443a) \
        $(SRC_ISO14443b) \
        $(SRC_CRAPTO1) \
        $(SRC_CRC) \
        $(SRC_ISO14443a) \
        $(SRC_ISO14443b) \
        $(SRC_CRAPTO1) \
        $(SRC_CRC) \

-       legic_prng.c \
-       iclass.c \
-       BigBuf.c \
-       optimized_cipher.c \
-       hfsnoop.c \
-       parity.c
-#  $(SRC_EMV)
+       $(SRC_ICLASS) \
+       $(SRC_EMV) \
+       parity.c \
+       usb_cdc.c \
+       cmd.c

 
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common
 
 
 # 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
 
 OBJS = $(OBJDIR)/fullimage.s19 
 FPGA_COMPRESSOR = ../client/fpga_compress