client/elf.h: Add missing Elf32_Phdr struct to compile under Mac OS X. client/flash...

[proxmark3-svn] / common / Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index 04b0b330cf58742ae4c2893fbe62ad987443093b..c2903a8f1feebba91646826dbc5800d2672ff3d5 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -9,23 +9,31 @@
 # (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
 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
 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,30 +42,24 @@ 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))
 ASMOBJ   = $(patsubst %.s,$(OBJDIR)/%.o,$(ASMSRC))
+VERSIONOBJ = $(OBJDIR)/version.o
 
 $(THUMBOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)
        $(CC) $(CFLAGS) -mthumb -mthumb-interwork -o $@ $< 
@@ -68,16 +70,18 @@ $(ARMOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)
 $(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
+# without touching start address or RAM addresses (.bss and .data sections)
 # 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
-       $(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
@@ -90,9 +94,9 @@ DEPENDENCY_FILES = $(patsubst %.c,$(OBJDIR)/%.d,$(notdir $(THUMBSRC))) \
        $(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) $< > $@
-$(OBJDIR)/%.d: %.s
+$(patsubst %.o,%.d,$(ASMOBJ)):$(OBJDIR)/%.d: %.s
        @$(CC) -MM -MT "$(@) $(@:.d=.o)" $(CFLAGS) $< > $@
 
 -include $(DEPENDENCY_FILES)