Pushed standard AT91 defines into main code

[proxmark3-svn] / armsrc / Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 8ad442f1aca4caa708380d296bbde16d4caa2dee..d73f2e77bc061c9ecb90083b102e67c97a836592 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -1,66 +1,62 @@
-PATH=..\..\devkitARM\bin;%PATH%\r
-CC     = arm-elf-gcc\r
-AS     = arm-elf-as\r
-LD     = arm-elf-ld\r
-OBJCOPY = arm-elf-objcopy\r
+# Makefile for armsrc, see ../common/Makefile.common for common settings\r
 \r
-OBJDIR = obj\r
+APP_INCLUDES = apps.h\r
 \r
-INCLUDE = -I../include\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_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b\r
+#-DWITH_LCD\r
 \r
-INCLUDES = ../include/proxmark3.h ../include/at91sam7s128.h ../include/config_gpio.h ../include/usb_cmd.h apps.h\r
-LIB = "..\..\devkitARM\lib\gcc\arm-elf\4.1.0\interwork"\r
+#SRC_LCD = fonts.c LCD.c\r
+SRC_ISO15693 = iso15693.c\r
+SRC_ISO14443a = iso14443a.c\r
+SRC_ISO14443b = iso14443.c\r
 \r
-# Add the "-DWITH_LCD" flag in CLFAGS to add support for LCD\r
-# and add OBJLCD to OBJ too\r
-CFLAGS = -O6 -c $(INCLUDE) -Wall\r
+THUMBSRC = start.c \\r
+       $(SRC_LCD) \\r
+       $(SRC_ISO15693) \\r
+       appmain.c \\r
+       lfops.c \\r
+       util.c \\r
+       hitag2.c \\r
+       usb.c\r
 \r
-OBJLCD = $(OBJDIR)/fonts.o \\r
-               $(OBJDIR)/LCD.o\r
+# These are to be compiled in ARM mode\r
+ARMSRC = fpgaloader.c \\r
+       $(SRC_ISO14443a) \\r
+       $(SRC_ISO14443b)\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
+# Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC\r
+include ../common/Makefile.common\r
 \r
-OBJFPGA = \\r
-               $(OBJDIR)/fpgaimg.o\r
+all: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19\r
 \r
-OBJCOMMON = \\r
-               $(OBJDIR)/usb.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
-all: osimage.s19\r
+$(OBJDIR)/fullimage.elf: $(VERSIONOBJ) $(OBJDIR)/fpga.o $(THUMBOBJ) $(ARMOBJ) $(ARMLIB)/libgcc.a\r
+       $(LD) -g -Tldscript -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
 \r
-$(OBJDIR)/fpgaimage.s19: $(OBJDIR)/fpgaimg.o\r
-       @echo obj/fpgaimage.s19\r
-       @$(LD) -g -Tldscript-fpga -o $(OBJDIR)\fpgaimage.elf -Map=obj/fpgaimage.map $(OBJDIR)/fpgaimg.o\r
-       @$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)\fpgaimage.elf $(OBJDIR)\fpgaimage.s19\r
+$(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fullimage.elf\r
+       $(OBJCOPY) -F elf32-littlearm --only-section .fpgaimage $^ $@  \r
 \r
-$(OBJDIR)/osimage.s19: $(OBJ) $(OBJCOMMON)\r
-       @echo obj/osimage.s19\r
-       @$(LD) -g -Tldscript -o $(OBJDIR)\osimage.elf $(OBJ) $(OBJCOMMON) -Map=obj/osimage.map $(LIB)\libgcc.a\r
-       @$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)\osimage.elf $(OBJDIR)\osimage.s19\r
-\r
-osimage.s19: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19\r
-       @echo osimage.s19\r
-\r
-$(OBJ): $(@B).c $(INCLUDES)\r
-       @echo $(@B).c\r
-       @$(CC) $(CFLAGS) -mthumb -mthumb-interwork $(@B).c -o $(OBJDIR)/$(@B).o\r
-\r
-$(OBJCOMMON): ../common/$(@B).c $(INCLUDES)\r
-       @echo $(@B).c\r
-       @$(CC) $(CFLAGS) -mthumb -mthumb-interwork ../common/$(@B).c -o $(OBJDIR)/$(@B).o\r
-\r
-$(OBJFPGA): $(@B).c $(INCLUDES)\r
-       @echo $(@B).c\r
-       @$(CC) $(CFLAGS) -mthumb -mthumb-interwork $(@B).c -o $(OBJDIR)/$(@B).o\r
+$(OBJDIR)/osimage.elf: $(OBJDIR)/fullimage.elf\r
+       $(OBJCOPY) -F elf32-littlearm --remove-section .fpgaimage $^ $@\r
 \r
 clean:\r
-       del /q obj\*.o\r
-       del /q obj\*.elf\r
-       del /q obj\*.s19\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 + $(OBJDIR)/osimage.s19   - The OS image\r
+       @echo + $(OBJDIR)/fpgaimage.s19 - The FPGA image\r
+       @echo + clean             - Clean $(OBJDIR)\r
+\r