2 files changed, 18 insertions, 6 deletions
diff --git a/firmware/Makefile b/firmware/Makefile
index 08126c1..9b75b3a 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -42,8 +42,8 @@ FLASH_TOOL = AT91FLASH
 
 # MCU name and submodel
 MCU      = arm7tdmi
-#SUBMDL   = AT91SAM7S64
-SUBMDL   = AT91SAM7S128
+SUBMDL   = AT91SAM7S64
+#SUBMDL   = AT91SAM7S128
 
 USE_THUMB_MODE = NO
 #USE_THUMB_MODE = YES
@@ -70,7 +70,7 @@ PATH_TO_LINKSCRIPTS=link/
 # Target file name (without extension).
 TARGET:=main_reqa
 
-USBSTRINGS=src/picc/usb_strings_app.h src/pcd/usb_strings_app.h
+USBSTRINGS=src/picc/usb_strings_app.h src/pcd/usb_strings_app.h src/simtrace/usb_strings_app.h
 
 # List C source files here. (C dependencies are automatically generated.)
 # use file-extension c for "c-only"-files
@@ -112,6 +112,11 @@ SRCARM += src/picc/tc_fdt.c src/picc/ssc_picc.c src/picc/adc.c \
 SRCARM += src/picc/$(TARGET).c 
 endif
 
+ifeq ($(BOARD), SIMTRACE)
+SRCARM += src/simtrace/iso7816_uart.c src/simtrace/tc_etu.c
+SRCARM += src/simtrace/$(TARGET).c 
+endif
+
 
 # List C++ source files here.
 # use file-extension cpp for C++-files (use extension .cpp)
@@ -202,6 +207,12 @@ CDEFS += -DPCD
 CINCS = -Isrc/pcd
 endif
 
+ifeq ($(BOARD),SIMTRACE)
+CDEFS += -DSIMTRACE
+CINCS = -Isrc/simtrace
+endif
+
+
 # Place -I options here
 CINCS += -Iinclude -Isrc
 
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)