added util.h include to avoid implicit function declaration

[proxmark3-svn] / common / Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index 6fb2045ff62fee56d302c115943e5672f119dd0c..d89683270cd6e2fecf9db4058b1eedd5e48fefd5 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -15,9 +15,12 @@
 
 # Make sure that all is the default target
 # (The including Makefile still needs to define what 'all' is)
+
+platform = $(shell uname)
+
 all:
 
-CROSS  ?= arm-eabi-
+CROSS  ?= arm-none-eabi-
 CC     = $(CROSS)gcc
 AS     = $(CROSS)as
 LD     = $(CROSS)ld
@@ -27,6 +30,9 @@ OBJDIR        = obj
 
 INCLUDE = -I../include -I../common
 
+TAR=tar
+TARFLAGS = -C .. -rvf
+
 # 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
@@ -39,10 +45,7 @@ MOVE=mv
 COPY=cp
 PATHSEP=/
 FLASH_TOOL=client/flasher
-DETECTED_OS=UNAME
-# You may/should set this in your environment
-LIBGCC ?= $(shell $(CC) -print-libgcc-file-name)
-PATH := $(PATH):$(DEVKITARM)/bin
+DETECTED_OS=$(UNAME)
 
 else
 
@@ -51,7 +54,6 @@ DELETE=del /q
 MOVE=ren
 COPY=copy
 PATHSEP=\\#
-LIBGCC ?= ../../devkitARM/lib/gcc/arm-elf/4.1.0/interwork/libgcc.a
 FLASH_TOOL=winsrc\\prox.exe
 DETECTED_OS=Windows
 
@@ -64,6 +66,8 @@ VPATH = . ../common/ ../fpga/
 INCLUDES = ../include/proxmark3.h ../include/at91sam7s512.h ../include/config_gpio.h ../include/usb_cmd.h $(APP_INCLUDES)
 
 CFLAGS =  -c $(INCLUDE) -Wall -Werror -pedantic -std=gnu99 $(APP_CFLAGS)
+LDFLAGS = -nostartfiles -nodefaultlibs -Wl,-gc-sections -n
+LIBS = -lgcc
 
 THUMBOBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(THUMBSRC))
 ARMOBJ   = $(ARMSRC:%.c=$(OBJDIR)/%.o)