X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/db335b3de0cbe71cabe37931aa085cffa0032239..d5be6f7cd4bedb62331f1ab61c63e74897b17d46:/common/Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index bba99ecd..c2903a8f 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -9,6 +9,16 @@
 # (The including Makefile still needs to define what 'all' is)
 all:
 
+CROSS   = arm-elf-
+CC	= $(CROSS)gcc
+AS	= $(CROSS)as
+LD	= $(CROSS)ld
+OBJCOPY = $(CROSS)objcopy
+
+OBJDIR	= obj
+
+INCLUDE = -I../include
+
 # Windows' echo echos its input verbatim, on Posix there is some
 #  amount of shell command line parsing going on. echo "" on 
 #  Windows yields literal "", on Linux yields an empty line
@@ -16,16 +26,14 @@ ifeq ($(shell echo ""),)
 
 # 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
 COPY=cp
 PATHSEP=/
-DETECTED_OS=Linux
+FLASH_TOOL=client/flasher
+DETECTED_OS=UNAME
 # You may/should set this in your environment
-ARMLIB ?= /usr/local/lib/gcc/arm-elf/4.3.3/interwork
-endif
+LIBGCC ?= $(shell $(CC) -print-libgcc-file-name)
 
 else
 
@@ -34,26 +42,19 @@ DELETE=del /q
 MOVE=ren
 COPY=copy
 PATHSEP=\\#
-ARMLIB ?= ../../devkitARM/lib/gcc/arm-elf/4.1.0/interwork
+LIBGCC ?= ../../devkitARM/lib/gcc/arm-elf/4.1.0/interwork/libgcc.a
+FLASH_TOOL=winsrc\\prox.exe
 DETECTED_OS=Windows
 
 endif
 
-CC	= arm-elf-gcc
-AS	= arm-elf-as
-LD	= arm-elf-ld
-OBJCOPY = arm-elf-objcopy
-
-OBJDIR	= obj
-
-INCLUDE = -I../include
 
 # 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/at91sam7s512.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))
@@ -75,11 +76,12 @@ $(VERSIONOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)
 # 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
-$(OBJDIR)/%.s19: $(OBJDIR)/%.elf
-	$(OBJCOPY) -Osrec --srec-forceS3 --strip-debug --no-change-warnings \
+OBJCOPY_TRANSLATIONS = --no-change-warnings \
 	--change-addresses -0x100000 --change-start 0 \
-	--change-section-address .bss+0 \
-	--change-section-address .data+0 $^ $@
+	--change-section-address .bss+0 --change-section-address .data+0 \
+	--change-section-address .commonarea+0
+$(OBJDIR)/%.s19: $(OBJDIR)/%.elf
+	$(OBJCOPY) -Osrec --srec-forceS3 --strip-debug $(OBJCOPY_TRANSLATIONS) $^ $@
 
 # version.c should be remade on every compilation
 .PHONY: version.c