From 4c8f596693744d2d820d75e5dafe7dc0b79e201c Mon Sep 17 00:00:00 2001 From: beaumontm Date: Tue, 20 Nov 2012 11:12:54 +0000 Subject: [PATCH 1/2] Changed compile option -lxscope to -fxscope in Makefiles --- experimental/app_pip_test/Makefile | 2 +- tests/test_tx_performance/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/experimental/app_pip_test/Makefile b/experimental/app_pip_test/Makefile index cb5e0e9..d638c5b 100644 --- a/experimental/app_pip_test/Makefile +++ b/experimental/app_pip_test/Makefile @@ -2,7 +2,7 @@ TARGET = XP-DSC-BLDC # TARGET = XP-MC-CTRL-L2 APP_NAME = -XCC_FLAGS = -Os -g -report -save-temps -lxscope +XCC_FLAGS = -Os -g -report -save-temps -fxscope USED_MODULES = module_pip module_ethernet module_otp_board_info module_ethernet_board_support # This change to the module path is so that this application can be in the diff --git a/tests/test_tx_performance/Makefile b/tests/test_tx_performance/Makefile index 7270c34..4074845 100644 --- a/tests/test_tx_performance/Makefile +++ b/tests/test_tx_performance/Makefile @@ -1,6 +1,6 @@ TARGET ?= SLICEKIT-L2 APP_NAME = -XCC_FLAGS = -g -O3 -lxscope +XCC_FLAGS = -g -O3 -fxscope USED_MODULES = module_xtcp module_ethernet_board_support ifeq ($(notdir $(abspath ..)),tests) From a9e68fadfd28eb79294cd9239dd3ddc8bb0712d4 Mon Sep 17 00:00:00 2001 From: beaumontm Date: Wed, 21 Nov 2012 13:24:36 +0000 Subject: [PATCH 2/2] Changed getmac.h tp otp_board_info.h --- module_tftp/src/tftp.xc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module_tftp/src/tftp.xc b/module_tftp/src/tftp.xc index a902929..53bb22a 100644 --- a/module_tftp/src/tftp.xc +++ b/module_tftp/src/tftp.xc @@ -17,7 +17,7 @@ #include #include "print.h" #include "uip_server.h" -#include "getmac.h" +#include "otp_board_info.h" #include "ethernet_server.h" #include "tftp.h" #include "tftp_app.h"