CHG: extern methods.

[proxmark3-svn] / armsrc / Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index bde50f0ec519624a19030a718b168c942e5f3d07..054f20b66f55e73bb38a849e8dad58dc96926bd5 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -9,15 +9,25 @@
 APP_INCLUDES = apps.h
 
 #remove one of the following defines and comment out the relevant line
 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 -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
-
-#SRC_LCD = fonts.c LCD.c
-SRC_LF = lfops.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c protocols.c
+#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_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 \
+
+SRC_LCD = fonts.c LCD.c
+SRC_LF = lfops.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c

 SRC_ISO15693 = iso15693.c iso15693tools.c
 SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c mifaresniff.c epa.c
 SRC_ISO14443b = iso14443b.c
 SRC_ISO15693 = iso15693.c iso15693tools.c
 SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c mifaresniff.c epa.c
 SRC_ISO14443b = iso14443b.c


@@ -43,38 +53,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_LEGIC) \
        $(SRC_LCD) \
        $(SRC_ISO15693) \
        $(SRC_LF) \
        $(SRC_ZLIB) \
        $(SRC_LEGIC) \

-       $(SRC_ISO14443b) \
-       $(SRC_ICLASS) \

        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 \
        BigBuf.c \
        ticks.c \

+       random.c \

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

-       $(SRC_CRC) \
-       $(SRC_CRAPTO1) \

        $(SRC_ISO14443a) \
        $(SRC_ISO14443a) \

-       parity.c
-#      $(SRC_ISO14443b) \
-#      $(SRC_ICLASS) \
-#  $(SRC_EMV) \
-       #BigBuf.c \
-
+       $(SRC_ISO14443b) \
+       $(SRC_CRAPTO1) \
+       $(SRC_CRC) \
+       $(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
 


@@ -110,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
        $(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)
 
 tarbin: $(OBJS)
        $(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(OBJS:%=armsrc/%) $(OBJS:%.s19=armsrc/%.elf)