From 527903ee1055ce844ab380c71223b69b538c448b Mon Sep 17 00:00:00 2001 From: Marco Grella Date: Wed, 11 Nov 2015 13:48:38 +0100 Subject: [PATCH] Added default BOARD value to let regression tests compile for any platform. --- .../Makefile.stm32nucleo-spirit1 | 26 ++++++++++++++----- regression-tests/Makefile.compile-test | 1 - 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/platform/stm32nucleo-spirit1/Makefile.stm32nucleo-spirit1 b/platform/stm32nucleo-spirit1/Makefile.stm32nucleo-spirit1 index 27cc1f6d2..ebc188377 100644 --- a/platform/stm32nucleo-spirit1/Makefile.stm32nucleo-spirit1 +++ b/platform/stm32nucleo-spirit1/Makefile.stm32nucleo-spirit1 @@ -1,14 +1,25 @@ CONTIKI_TARGET_DIRS = . -ifeq ($(BOARD),ids01a4) - ${info Using 868 MHz SPIRIT1 Board} +ifeq ($(BOARD),) + BOARD=ids01a4 + ${info ***************************************************} + ${info BOARD not specified, default to ids01a4 (868 MHz)!} + ${info ***************************************************} +else ifeq ($(BOARD),ids01a4) + ${info ***************************************************} + ${info Using ids01a4 SPIRIT1 expansion board (868 MHz)} + ${info ***************************************************} else ifeq ($(BOARD),ids01a5) - ${info Using 915 MHz SPIRIT1 Board} + ${info ***************************************************} + ${info Using ids01a5 SPIRIT1 expansion board (915 MHz)} + ${info ***************************************************} else - ${info You must specify which SPIRIT1 board you use:} - ${info make BOARD=ids01a4 for X-NUCLEO-IDS01A4 (868 MHz)} - ${info make BOARD=ids01a5 for X-NUCLEO-IDS01A5 (915 MHz)} + ${info ***************************************************} + ${info You must specify a valid SPIRIT1 board to use:} + ${info make BOARD=ids01a4 for X-NUCLEO-IDS01A4 (868 MHz)} + ${info make BOARD=ids01a5 for X-NUCLEO-IDS01A5 (915 MHz)} + ${info ***************************************************} ${error } endif @@ -18,11 +29,14 @@ PLATFORM_ROOT_DIR = $(CONTIKI)/platform/$(TARGET) ifeq ($(SENSORBOARD),iks01a1) ${info Compiling with X-NUCLEO-IKS01A1 sensors files} + ${info ***************************************************} -include $(PLATFORM_ROOT_DIR)/Makefile.$(SENSORBOARD) else ifeq ($(SENSORBOARD),) ${info NOT compiling files for any sensors expansion board} + ${info ***************************************************} else ${info Error: SENSORBOARD can be: iks01a1} + ${info ***************************************************} ${error } endif diff --git a/regression-tests/Makefile.compile-test b/regression-tests/Makefile.compile-test index 1793321ee..60eaf4279 100644 --- a/regression-tests/Makefile.compile-test +++ b/regression-tests/Makefile.compile-test @@ -41,7 +41,6 @@ define dooneexample @echo Building example $(3): $(1) for target $(2) @((cd $(EXAMPLESDIR)/$(1); \ export STM32W_CPUREV=CC; \ - export BOARD=ids01a5; \ make TARGET=$(2) clean && make TARGET=$(2) WERROR=1) > \ $(3)-$(subst /,-,$(1))$(2).report 2>&1 && \ (echo $(1) $(2): OK | tee $(3)-$(subst /,-,$(1))$(2).summary) || \