Finalized migration to new USB CDC interface

[proxmark3-svn] / common / Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index 7072ede535306a46b91e26e52fb9d90b4a38ad77..2befd456d5c4df28718982babc08debba1586395 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)
 
 # Make sure that all is the default target
 # (The including Makefile still needs to define what 'all' is)

+
+platform = $(shell uname)
+

 all:
 
 all:
 

-CROSS  ?= arm-eabi-
+CROSS  ?= arm-none-eabi-

 CC     = $(CROSS)gcc
 AS     = $(CROSS)as
 LD     = $(CROSS)ld
 CC     = $(CROSS)gcc
 AS     = $(CROSS)as
 LD     = $(CROSS)ld


@@ -27,6 +30,9 @@ OBJDIR        = obj
 
 INCLUDE = -I../include -I../common
 
 
 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
 # 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
 COPY=cp
 PATHSEP=/
 FLASH_TOOL=client/flasher

-DETECTED_OS=UNAME
-# You may/should set this in your environment
-LIBGCC ?= $(DEVKITARM)/lib/gcc/arm-eabi/4.4.2/libgcc.a
-PATH := $(PATH):$(DEVKITARM)/bin
+DETECTED_OS=$(UNAME)

 
 else
 
 
 else
 


@@ -51,7 +54,6 @@ DELETE=del /q
 MOVE=ren
 COPY=copy
 PATHSEP=\\#
 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
 
 FLASH_TOOL=winsrc\\prox.exe
 DETECTED_OS=Windows
 


@@ -63,7 +65,9 @@ VPATH = . ../common/ ../fpga/
 
 INCLUDES = ../include/proxmark3.h ../include/at91sam7s512.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 -Werror -pedantic -std=gnu99 $(APP_CFLAGS)
+CFLAGS =  -c $(INCLUDE) -Wall -Werror -pedantic -std=c99 $(APP_CFLAGS) -Os
+LDFLAGS = -nostartfiles -nodefaultlibs -Wl,-gc-sections -n
+LIBS = -lgcc

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