From e50e2f8c62a262c6ee109204b30b485a5bb3c074 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Thu, 18 Nov 2010 23:55:58 +0100 Subject: simtrace: Commit Makefile changes to support build of simtrace WARNING These changes will enable the simtrace firmware to be built like this: make -f Makefile.dfu BOARD=OLIMEX make BOARD=SIMTRACE DEBUG=1 TARGET=main_simtrace --- firmware/Makefile.dfu | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'firmware/Makefile.dfu') diff --git a/firmware/Makefile.dfu b/firmware/Makefile.dfu index c526fc2..45a042e 100644 --- a/firmware/Makefile.dfu +++ b/firmware/Makefile.dfu @@ -41,8 +41,8 @@ FLASH_TOOL = AT91FLASH # MCU name and submodel MCU = arm7tdmi -#SUBMDL = AT91SAM7S64 -SUBMDL = AT91SAM7S256 +SUBMDL = AT91SAM7S64 +#SUBMDL = AT91SAM7S256 USE_THUMB_MODE = NO #USE_THUMB_MODE = YES @@ -69,7 +69,7 @@ PATH_TO_LINKSCRIPTS=link/ # Target file name (without extension). TARGET:=dfu -USBSTRINGS=src/picc/usb_strings_dfu.h src/pcd/usb_strings_dfu.h +USBSTRINGS=src/picc/usb_strings_dfu.h src/pcd/usb_strings_dfu.h src/simtrace/usb_strings_dfu.h # List C source files here. (C dependencies are automatically generated.) # use file-extension c for "c-only"-files @@ -158,6 +158,7 @@ endif ifeq ($(BOARD),OLIMEX) CDEFS += -DOLIMEX ADEFS += -DOLIMEX +CINCS = -Isrc/simtrace endif ifeq ($(BOARD),PICC) -- cgit v1.2.3 From ff741ee31fe2a6b25f8f7fcfb1397bb0c82616d6 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Thu, 16 Jun 2011 21:00:02 +0200 Subject: simtrace: add more definitions regarding real hw prototype --- firmware/Makefile.dfu | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'firmware/Makefile.dfu') diff --git a/firmware/Makefile.dfu b/firmware/Makefile.dfu index 45a042e..dbe9b35 100644 --- a/firmware/Makefile.dfu +++ b/firmware/Makefile.dfu @@ -174,6 +174,14 @@ ADEFS += -DPCD CINCS = -Isrc/pcd endif +ifeq ($(BOARD),SIMTRACE) +SUBMDL = AT91SAM7S256 +CDEFS += -DSIMTRACE +ADEFS += -DSIMTRACE +CINCS = -Isrc/simtrace +endif + + # Place -I options here CINCS += -Iinclude -Isrc -- cgit v1.2.3 From 9f120cdf57b9dc2ca8112cbb89587f77df4facd2 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 30 Jul 2011 00:38:20 +0200 Subject: Makefile: SIMtrace uses SAM7S128, not 256 --- firmware/Makefile.dfu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'firmware/Makefile.dfu') diff --git a/firmware/Makefile.dfu b/firmware/Makefile.dfu index dbe9b35..3c797ef 100644 --- a/firmware/Makefile.dfu +++ b/firmware/Makefile.dfu @@ -175,7 +175,7 @@ CINCS = -Isrc/pcd endif ifeq ($(BOARD),SIMTRACE) -SUBMDL = AT91SAM7S256 +SUBMDL = AT91SAM7S128 CDEFS += -DSIMTRACE ADEFS += -DSIMTRACE CINCS = -Isrc/simtrace -- cgit v1.2.3