X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8652988d62b19631e498b62a3800f0decb5e743a..b1083ec9f753e654e8824c267b5e90298060e96a:/armsrc/Makefile?ds=sidebyside

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 567c8d12..1a706360 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -2,48 +2,55 @@
 
 APP_INCLUDES = apps.h
 
-# Add the "-DWITH_LCD" flag in APP_CLFAGS to add support for LCD
-# and add SRC_LCD to SRC_MAIN
-APP_CFLAGS	= -O6
-
-SRC_LCD = fonts.c LCD.c
-
-SRC_MAIN = start.c \
+#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	= -O6 -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b
+#-DWITH_LCD
+
+#SRC_LCD = fonts.c LCD.c
+SRC_ISO15693 = iso15693.c
+SRC_ISO14443a = iso14443a.c
+SRC_ISO14443b = iso14443.c
+
+THUMBSRC = start.c \
+	$(SRC_LCD) \
+	$(SRC_ISO15693) \
 	appmain.c \
-	fpga.c \
 	lfops.c \
-	iso15693.c \
 	util.c \
+	hitag2.c \
 	usb.c
 
 # These are to be compiled in ARM mode
-SRC_MAIN_FAST =  iso14443.c \
-	iso14443a.c
-
-SRC_FPGA = fpgaimg.c
-
-THUMBSRC = $(SRC_MAIN) $(SRC_FPGA)
-ARMSRC = $(SRC_MAIN_FAST)
+ARMSRC = fpgaloader.c \
+	legicrf.c \
+	$(SRC_ISO14443a) \
+	$(SRC_ISO14443b)
 
-MAIN_OBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(SRC_MAIN) $(SRC_MAIN_FAST))
-
-# Do not move this inclusion before the definition of {THUMB,ASM,ARM}{OBJ,SRC}
+# Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common
 
 all: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19
 
-$(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fpgaimg.o
-	$(LD) -g -Tldscript-fpga -Map=$(patsubst %.elf,%.map,$@) -o $@ $^
+$(OBJDIR)/fpga.o: fpga.bit
+	$(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  $^ $@
 
-$(OBJDIR)/osimage.elf: $(MAIN_OBJ) $(ARMLIB)/libgcc.a
+$(OBJDIR)/fullimage.elf: $(VERSIONOBJ) $(OBJDIR)/fpga.o $(THUMBOBJ) $(ARMOBJ) $(ARMLIB)/libgcc.a
 	$(LD) -g -Tldscript -Map=$(patsubst %.elf,%.map,$@) -o $@ $^
 
+$(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fullimage.elf
+	$(OBJCOPY) -F elf32-littlearm --only-section .fpgaimage $^ $@  
+
+$(OBJDIR)/osimage.elf: $(OBJDIR)/fullimage.elf
+	$(OBJCOPY) -F elf32-littlearm --remove-section .fpgaimage $^ $@
+
 clean:
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.o
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.elf
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.s19
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.map
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.d
+	$(DELETE) version.c
 
 .PHONY: all clean help
 help: