X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/0fc0fca5830c9d1a430f40ff935fb399f91b8adc..0fa9ca5b53e412decad0df1f6b5baca73ae76a9c:/common/Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index c4da75e1..04b0b330 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -20,6 +20,7 @@ ifeq ($(UNAME), Linux)
 # Linux. (Todo: Add MacOS X if appropriate)
 DELETE=rm -rf
 MOVE=mv
+COPY=cp
 PATHSEP=/
 DETECTED_OS=Linux
 # You may/should set this in your environment
@@ -31,6 +32,7 @@ else
 # Assume that we are running on Windows.
 DELETE=del /q
 MOVE=ren
+COPY=copy
 PATHSEP=\\#
 ARMLIB ?= ../../devkitARM/lib/gcc/arm-elf/4.1.0/interwork
 DETECTED_OS=Windows
@@ -46,8 +48,8 @@ OBJDIR	= obj
 
 INCLUDE = -I../include
 
-# Also search prerequisites in the common directory (for usb.c)
-VPATH = . ../common/
+# Also search prerequisites in the common directory (for usb.c), and the fpga directory (for fpga.bit)
+VPATH = . ../common/ ../fpga/
 
 INCLUDES = ../include/proxmark3.h ../include/at91sam7s128.h ../include/config_gpio.h ../include/usb_cmd.h $(APP_INCLUDES)
 
@@ -66,8 +68,21 @@ $(ARMOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)
 $(ASMOBJ): $(OBJDIR)/%.o: %.s
 	$(CC) $(CFLAGS) -mthumb-interwork -o $@ $<
 
+# This objcopy call translates physical flash addresses to logical addresses
+# See ldscript.common. -- Henryk Plötz <henryk@ploetzli.ch> 2009-08-27
 $(OBJDIR)/%.s19: $(OBJDIR)/%.elf
-	$(OBJCOPY) -Osrec --srec-forceS3 $^ $@
+	$(OBJCOPY) -Osrec --srec-forceS3  --no-change-warnings \
+	--change-section-address bootphase1-0x100000 \
+	--change-section-address bootphase2-0x100000 \
+	--change-section-address fpgaimage-0x100000 \
+	--change-section-address .start-0x100000 \
+	--change-section-address .text-0x100000 \
+	--change-section-address .rodata-0x100000 $^ $@
+
+# version.c should be remade on every compilation
+.PHONY: version.c
+version.c: default_version.c
+	perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@ 
 
 # Automatic dependency generation
 DEPENDENCY_FILES = $(patsubst %.c,$(OBJDIR)/%.d,$(notdir $(THUMBSRC))) \
@@ -76,8 +91,8 @@ DEPENDENCY_FILES = $(patsubst %.c,$(OBJDIR)/%.d,$(notdir $(THUMBSRC))) \
 
 $(DEPENDENCY_FILES): Makefile ../common/Makefile.common
 $(OBJDIR)/%.d: %.c
-	$(CC) -MM -MT "$(@) $(@:.d=.o)" $(CFLAGS) $< > $@
+	@$(CC) -MM -MT "$(@) $(@:.d=.o)" $(CFLAGS) $< > $@
 $(OBJDIR)/%.d: %.s
-	$(CC) -MM -MT "$(@) $(@:.d=.o)" $(CFLAGS) $< > $@
+	@$(CC) -MM -MT "$(@) $(@:.d=.o)" $(CFLAGS) $< > $@
 
 -include $(DEPENDENCY_FILES)