Change flashos.bat for the new flash procedure

[proxmark3-svn] / common / Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index 1c4738a16516967b86331b24c2e4eaa049449f03..faf59520d09b498ee94429cbdf847b044c5aa609 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -14,13 +14,15 @@ all:
 #  Windows yields literal "", on Linux yields an empty line
 ifeq ($(shell echo ""),)
 
 #  Windows yields literal "", on Linux yields an empty line
 ifeq ($(shell echo ""),)
 

-# This is properly a proper system, so we can use uname
+# This is probably a proper system, so we can use uname

 UNAME := $(shell uname)
 ifeq ($(UNAME), Linux)
 # Linux. (Todo: Add MacOS X if appropriate)
 DELETE=rm -rf
 MOVE=mv
 UNAME := $(shell uname)
 ifeq ($(UNAME), Linux)
 # Linux. (Todo: Add MacOS X if appropriate)
 DELETE=rm -rf
 MOVE=mv

+COPY=cp

 PATHSEP=/
 PATHSEP=/

+FLASH_TOOL=linux/flasher

 DETECTED_OS=Linux
 # You may/should set this in your environment
 ARMLIB ?= /usr/local/lib/gcc/arm-elf/4.3.3/interwork
 DETECTED_OS=Linux
 # You may/should set this in your environment
 ARMLIB ?= /usr/local/lib/gcc/arm-elf/4.3.3/interwork


@@ -31,31 +33,35 @@ else
 # Assume that we are running on Windows.
 DELETE=del /q
 MOVE=ren
 # 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
 PATHSEP=\\#
 ARMLIB ?= ../../devkitARM/lib/gcc/arm-elf/4.1.0/interwork

+FLASH_TOOL=winsrc\\prox.exe

 DETECTED_OS=Windows
 
 endif
 
 DETECTED_OS=Windows
 
 endif
 

-CC     = arm-elf-gcc
-AS     = arm-elf-as
-LD     = arm-elf-ld
-OBJCOPY = arm-elf-objcopy
+CROSS   = arm-elf-
+CC     = $(CROSS)gcc
+AS     = $(CROSS)as
+LD     = $(CROSS)ld
+OBJCOPY = $(CROSS)objcopy

 
 OBJDIR = obj
 
 INCLUDE = -I../include
 
 
 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)
 
 
 INCLUDES = ../include/proxmark3.h ../include/at91sam7s128.h ../include/config_gpio.h ../include/usb_cmd.h $(APP_INCLUDES)
 

-CFLAGS =  -c $(INCLUDE) -Wall $(APP_CFLAGS)
+CFLAGS =  -c $(INCLUDE) -Wall -Werror -pedantic -std=gnu99 $(APP_CFLAGS)

 
 THUMBOBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(THUMBSRC))
 ARMOBJ   = $(patsubst %.c,$(OBJDIR)/%.o,$(ARMSRC))
 ASMOBJ   = $(patsubst %.s,$(OBJDIR)/%.o,$(ASMSRC))
 
 THUMBOBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(THUMBSRC))
 ARMOBJ   = $(patsubst %.c,$(OBJDIR)/%.o,$(ARMSRC))
 ASMOBJ   = $(patsubst %.s,$(OBJDIR)/%.o,$(ASMSRC))

+VERSIONOBJ = $(OBJDIR)/version.o

 
 $(THUMBOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)
        $(CC) $(CFLAGS) -mthumb -mthumb-interwork -o $@ $< 
 
 $(THUMBOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)
        $(CC) $(CFLAGS) -mthumb -mthumb-interwork -o $@ $< 


@@ -66,16 +72,23 @@ $(ARMOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)
 $(ASMOBJ): $(OBJDIR)/%.o: %.s
        $(CC) $(CFLAGS) -mthumb-interwork -o $@ $<
 
 $(ASMOBJ): $(OBJDIR)/%.o: %.s
        $(CC) $(CFLAGS) -mthumb-interwork -o $@ $<
 

+$(VERSIONOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)
+       $(CC) $(CFLAGS) -mthumb -mthumb-interwork -o $@ $< 
+

 # This objcopy call translates physical flash addresses to logical addresses
 # This objcopy call translates physical flash addresses to logical addresses

+# without touching start address or RAM addresses (.bss and .data sections)

 # See ldscript.common. -- Henryk Plötz <henryk@ploetzli.ch> 2009-08-27
 # See ldscript.common. -- Henryk Plötz <henryk@ploetzli.ch> 2009-08-27

+OBJCOPY_TRANSLATIONS = --no-change-warnings \
+       --change-addresses -0x100000 --change-start 0 \
+       --change-section-address .bss+0 --change-section-address .data+0 \
+       --change-section-address .commonarea+0

 $(OBJDIR)/%.s19: $(OBJDIR)/%.elf
 $(OBJDIR)/%.s19: $(OBJDIR)/%.elf

-       $(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 $^ $@
+       $(OBJCOPY) -Osrec --srec-forceS3 --strip-debug $(OBJCOPY_TRANSLATIONS) $^ $@
+
+# 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))) \
 
 # Automatic dependency generation
 DEPENDENCY_FILES = $(patsubst %.c,$(OBJDIR)/%.d,$(notdir $(THUMBSRC))) \


@@ -83,9 +96,9 @@ DEPENDENCY_FILES = $(patsubst %.c,$(OBJDIR)/%.d,$(notdir $(THUMBSRC))) \
        $(patsubst %.s,$(OBJDIR)/%.d,$(notdir $(ASMSRC)))
 
 $(DEPENDENCY_FILES): Makefile ../common/Makefile.common
        $(patsubst %.s,$(OBJDIR)/%.d,$(notdir $(ASMSRC)))
 
 $(DEPENDENCY_FILES): Makefile ../common/Makefile.common

-$(OBJDIR)/%.d: %.c
+$(patsubst %.o,%.d,$(THUMBOBJ) $(ARMOBJ)): $(OBJDIR)/%.d: %.c

        @$(CC) -MM -MT "$(@) $(@:.d=.o)" $(CFLAGS) $< > $@
        @$(CC) -MM -MT "$(@) $(@:.d=.o)" $(CFLAGS) $< > $@

-$(OBJDIR)/%.d: %.s
+$(patsubst %.o,%.d,$(ASMOBJ)):$(OBJDIR)/%.d: %.s

        @$(CC) -MM -MT "$(@) $(@:.d=.o)" $(CFLAGS) $< > $@
 
 -include $(DEPENDENCY_FILES)
        @$(CC) -MM -MT "$(@) $(@:.d=.o)" $(CFLAGS) $< > $@
 
 -include $(DEPENDENCY_FILES)