X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7e931bbd32c878f6795a9c07d70ee96df2f675b2..b1083ec9f753e654e8824c267b5e90298060e96a:/armsrc/Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 1acfdd88..1a706360 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -1,53 +1,63 @@
 # Makefile for armsrc, see ../common/Makefile.common for common settings
-include ../common/Makefile.common
 
 APP_INCLUDES = apps.h
 
-# Add the "-DWITH_LCD" flag in APP_CLFAGS to add support for LCD
-# and add OBJLCD to OBJ too
-APP_CFLAGS	= -O6
-
-OBJLCD = $(OBJDIR)/fonts.o \
-		$(OBJDIR)/LCD.o
-
-OBJ =	$(OBJDIR)/start.o \
-		$(OBJDIR)/appmain.o \
-		$(OBJDIR)/fpga.o \
-		$(OBJDIR)/lfops.o \
-		$(OBJDIR)/iso14443.o \
-		$(OBJDIR)/iso14443a.o \
-		$(OBJDIR)/iso15693.o \
-		$(OBJDIR)/util.o \
-		$(OBJDIR)/usb.o
-
-OBJFPGA = \
-		$(OBJDIR)/fpgaimg.o
+#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 \
+	lfops.c \
+	util.c \
+	hitag2.c \
+	usb.c
+
+# These are to be compiled in ARM mode
+ARMSRC = fpgaloader.c \
+	legicrf.c \
+	$(SRC_ISO14443a) \
+	$(SRC_ISO14443b)
+
+# 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: $(OBJ) $(OBJCOMMON) $(ARMLIB)/libgcc.a
+$(OBJDIR)/fullimage.elf: $(VERSIONOBJ) $(OBJDIR)/fpga.o $(THUMBOBJ) $(ARMOBJ) $(ARMLIB)/libgcc.a
 	$(LD) -g -Tldscript -Map=$(patsubst %.elf,%.map,$@) -o $@ $^
 
-$(OBJDIR)/%.s19: $(OBJDIR)/%.elf
-	$(OBJCOPY) -Osrec --srec-forceS3 $^ $@
+$(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fullimage.elf
+	$(OBJCOPY) -F elf32-littlearm --only-section .fpgaimage $^ $@  
 
-$(OBJ) $(OBJFPGA): $(OBJDIR)/%.o: %.c $(INCLUDES)
-	$(CC) $(CFLAGS) -mthumb -mthumb-interwork $< -o $@
+$(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:
 	@echo Multi-OS Makefile, you are running on $(DETECTED_OS)
 	@echo Possible targets:
-	@echo +	all           - Make both:
-	@echo +	osimage.s19   - The OS image
-	@echo +	fpgaimage.s19 - The FPGA image
-	@echo +	clean         - Clean $(OBJDIR)
+	@echo +	all               - Make both:
+	@echo +	$(OBJDIR)/osimage.s19   - The OS image
+	@echo +	$(OBJDIR)/fpgaimage.s19 - The FPGA image
+	@echo +	clean             - Clean $(OBJDIR)
+