X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6658905f18a1eebc148836f26c731dea9c1377dc..3749f430e53682802c8253a8cb95914af2b35e2a:/armsrc/Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index e8db3b31..8ad442f1 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -1,3 +1,4 @@
+PATH=..\..\devkitARM\bin;%PATH%
 CC	= arm-elf-gcc
 AS	= arm-elf-as
 LD	= arm-elf-ld
@@ -10,17 +11,21 @@ INCLUDE = -I../include
 INCLUDES = ../include/proxmark3.h ../include/at91sam7s128.h ../include/config_gpio.h ../include/usb_cmd.h apps.h
 LIB = "..\..\devkitARM\lib\gcc\arm-elf\4.1.0\interwork"
 
+# Add the "-DWITH_LCD" flag in CLFAGS to add support for LCD
+# and add OBJLCD to OBJ too
 CFLAGS	= -O6 -c $(INCLUDE) -Wall
 
+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)/fonts.o \
-		$(OBJDIR)/LCD.o
+		$(OBJDIR)/util.o
 
 OBJFPGA = \
 		$(OBJDIR)/fpgaimg.o
@@ -32,12 +37,12 @@ all: osimage.s19
 
 $(OBJDIR)/fpgaimage.s19: $(OBJDIR)/fpgaimg.o
 	@echo obj/fpgaimage.s19
-	@$(LD) -g -Tldscript-fpga -o $(OBJDIR)\fpgaimage.elf $(OBJDIR)/fpgaimg.o
+	@$(LD) -g -Tldscript-fpga -o $(OBJDIR)\fpgaimage.elf -Map=obj/fpgaimage.map $(OBJDIR)/fpgaimg.o
 	@$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)\fpgaimage.elf $(OBJDIR)\fpgaimage.s19
 
 $(OBJDIR)/osimage.s19: $(OBJ) $(OBJCOMMON)
 	@echo obj/osimage.s19
-	@$(LD) -g -Tldscript -o $(OBJDIR)\osimage.elf $(OBJ) $(OBJCOMMON) $(LIB)\libgcc.a
+	@$(LD) -g -Tldscript -o $(OBJDIR)\osimage.elf $(OBJ) $(OBJCOMMON) -Map=obj/osimage.map $(LIB)\libgcc.a
 	@$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)\osimage.elf $(OBJDIR)\osimage.s19
 
 osimage.s19: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19