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

diff --git a/common/Makefile.common b/common/Makefile.common
index c4da75e1..a17b8a1b 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -46,8 +46,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 +66,16 @@ $(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 $^ $@
 
 # Automatic dependency generation
 DEPENDENCY_FILES = $(patsubst %.c,$(OBJDIR)/%.d,$(notdir $(THUMBSRC))) \
@@ -76,8 +84,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)