fix OS detection, libgcc detection

[proxmark3-svn] / armsrc / Makefile

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