change usb_cmd struct to be more sane

[proxmark3-svn] / common / Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index 901ce2e155d44ba5f06fed91a87128a07efa01e1..6260eb05da4e5803f2f8d29b02be72ba0c3b46e4 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -14,7 +14,7 @@ all:
 #  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)
@@ -22,6 +22,7 @@ DELETE=rm -rf
 MOVE=mv
 COPY=cp
 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
@@ -35,14 +36,16 @@ MOVE=ren
 COPY=copy
 PATHSEP=\\#
 ARMLIB ?= ../../devkitARM/lib/gcc/arm-elf/4.1.0/interwork
+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
+CROSS   = arm-elf-
+CC     = $(CROSS)gcc
+AS     = $(CROSS)as
+LD     = $(CROSS)ld
+OBJCOPY = $(CROSS)objcopy
 
 OBJDIR = obj
 
@@ -51,9 +54,9 @@ 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))
@@ -73,15 +76,14 @@ $(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