Client cleanup and restructuring. Stage 1...

[proxmark3-svn] / armsrc / Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 567c8d1232fe97670ebb0499422b458babce203e..a6b2fcc801887827986653b19e0f883f1860bb94 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -2,48 +2,58 @@
 \r
 APP_INCLUDES = apps.h\r
 \r
-# Add the "-DWITH_LCD" flag in APP_CLFAGS to add support for LCD\r
-# and add SRC_LCD to SRC_MAIN\r
-APP_CFLAGS     = -O6\r
+#remove one of the following defines and comment out the relevant line\r
+#in the next section to remove that particular feature from compilation  \r
+APP_CFLAGS     = -O6 -DWITH_LF -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b\r
+#-DWITH_LCD \r
 \r
-SRC_LCD = fonts.c LCD.c\r
+#SRC_LCD = fonts.c LCD.c\r
+SRC_LF = lfops.c hitag2.c\r
+SRC_ISO15693 = iso15693.c\r
+SRC_ISO14443a = iso14443a.c\r
+SRC_ISO14443b = iso14443.c\r
 \r
-SRC_MAIN = start.c \\r
-       appmain.c \\r
-       fpga.c \\r
-       lfops.c \\r
-       iso15693.c \\r
+THUMBSRC = start.c \\r
+       $(SRC_LCD) \\r
+       $(SRC_ISO15693) \\r
+       $(SRC_LF) \\r
+       appmain.c printf.c \\r
        util.c \\r
        usb.c\r
 \r
 # These are to be compiled in ARM mode\r
-SRC_MAIN_FAST =  iso14443.c \\r
-       iso14443a.c\r
+ARMSRC = fpgaloader.c \\r
+       legicrf.c \\r
+       iso14443crc.c \\r
+       crc16.c \\r
+       $(SRC_ISO14443a) \\r
+       $(SRC_ISO14443b) \\r
+       crc.c\r
 \r
-SRC_FPGA = fpgaimg.c\r
-\r
-THUMBSRC = $(SRC_MAIN) $(SRC_FPGA)\r
-ARMSRC = $(SRC_MAIN_FAST)\r
-\r
-MAIN_OBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(SRC_MAIN) $(SRC_MAIN_FAST))\r
-\r
-# Do not move this inclusion before the definition of {THUMB,ASM,ARM}{OBJ,SRC}\r
+# Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC\r
 include ../common/Makefile.common\r
 \r
 all: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19\r
 \r
-$(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fpgaimg.o\r
-       $(LD) -g -Tldscript-fpga -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
+$(OBJDIR)/fpga.o: fpga.bit\r
+       $(OBJCOPY) -O elf32-littlearm -I binary -B arm --redefine-sym _binary____fpga_fpga_bit_start=_binary_fpga_bit_start --redefine-sym _binary____fpga_fpga_bit_end=_binary_fpga_bit_end --prefix-sections=fpga_bit  $^ $@\r
 \r
-$(OBJDIR)/osimage.elf: $(MAIN_OBJ) $(ARMLIB)/libgcc.a\r
+$(OBJDIR)/fullimage.elf: $(VERSIONOBJ) $(OBJDIR)/fpga.o $(THUMBOBJ) $(ARMOBJ) $(LIBGCC)\r
        $(LD) -g -Tldscript -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
 \r
+$(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fullimage.elf\r
+       $(OBJCOPY) -F elf32-littlearm --only-section .fpgaimage $^ $@  \r
+\r
+$(OBJDIR)/osimage.elf: $(OBJDIR)/fullimage.elf\r
+       $(OBJCOPY) -F elf32-littlearm --remove-section .fpgaimage $^ $@\r
+\r
 clean:\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.o\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.elf\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.s19\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.map\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.d\r
+       $(DELETE) version.c\r
 \r
 .PHONY: all clean help\r
 help:\r