diff --git a/cpu/stm32w108/Makefile.stm32w108 b/cpu/stm32w108/Makefile.stm32w108 index 16bfbb728..b7e835cab 100644 --- a/cpu/stm32w108/Makefile.stm32w108 +++ b/cpu/stm32w108/Makefile.stm32w108 @@ -98,14 +98,14 @@ ifndef DEBUG OPTI = -Os -ffunction-sections endif -ifeq ($(CPUREV), CC) +ifeq ($(STM32W_CPUREV), CC) LD-EXT=-stm32w108CC ${warning "using stm32w108CC specific ld file"} -else ifeq ($(CPUREV), xB) +else ifeq ($(STM32W_CPUREV), xB) LD-EXT=-stm32w108xB ${warning "using stm32w108xB specific ld file"} else - ${error "No CPUREV specified. Cpu revision should be specified. Please read cpu/stm32w108/README.txt for more details."} + ${error "No STM32W_CPUREV specified. Cpu revision should be specified. Please read cpu/stm32w108/README.txt for more details."} endif CFLAGSNO = -mthumb -mcpu=cortex-m3 -D "PLATFORM_HEADER=\"hal/micro/cortexm3/compiler/gnu.h\"" \ diff --git a/cpu/stm32w108/README.txt b/cpu/stm32w108/README.txt index 71c989222..8027c22c5 100644 --- a/cpu/stm32w108/README.txt +++ b/cpu/stm32w108/README.txt @@ -2,21 +2,21 @@ Building instructions. In order to build your applications you need to find out the right cpu revision for the board you are using. -Valid CPUREV values are CC or xB +Valid STM32W_CPUREV values are CC or xB Examples: The MB851RevD board has a cpu with code stm32w 108CCU7 -so CC is your CPUREV value and the command is -make TARGET=mbxxx CPUREV=CC ... +so CC is your STM32W_CPUREV value and the command is +make TARGET=mbxxx STM32W_CPUREV=CC ... or The MB851RevC board has a cpu with code stm32w 108CBU6 -so xB is your CPUREV value. -make TARGET=mbxxx CPUREV=xB ... +so xB is your STM32W_CPUREV value. +make TARGET=mbxxx STM32W_CPUREV=xB ... NOTE: if the last word is B you need to use x as wildcard. diff --git a/platform/mbxxx/dev/contact-sensor.c b/platform/mbxxx/dev/contact-sensor.c index 6b9bb4876..0b6e83f56 100644 --- a/platform/mbxxx/dev/contact-sensor.c +++ b/platform/mbxxx/dev/contact-sensor.c @@ -41,6 +41,7 @@ * Contact sensor. * \author * Stefano Pascali +* Marco Grella */ /*---------------------------------------------------------------------------*/ diff --git a/platform/mbxxx/dev/contact-sensor.h b/platform/mbxxx/dev/contact-sensor.h index 96798afc3..d7ebc7412 100644 --- a/platform/mbxxx/dev/contact-sensor.h +++ b/platform/mbxxx/dev/contact-sensor.h @@ -41,6 +41,7 @@ * Contact magnetic sensor header file. * \author * Stefano Pascali +* Marco Grella */ /*---------------------------------------------------------------------------*/ diff --git a/platform/mbxxx/platform-conf.h b/platform/mbxxx/platform-conf.h index 9a1b9fb72..7c19a9e52 100644 --- a/platform/mbxxx/platform-conf.h +++ b/platform/mbxxx/platform-conf.h @@ -44,6 +44,7 @@ * Platform-conf.h for MBXXX. * \author * Stefano Pascali +* Marco Grella */ /*---------------------------------------------------------------------------*/ diff --git a/regression-tests/Makefile.compile-test b/regression-tests/Makefile.compile-test index f6d7aa087..4ca4e3fd7 100644 --- a/regression-tests/Makefile.compile-test +++ b/regression-tests/Makefile.compile-test @@ -40,7 +40,8 @@ addzero = $(if $(call gt,${nine},$(1)),$(words ${1}),0$(words ${1})) define dooneexample @echo Building example $(3): $(1) for target $(2) @((cd $(EXAMPLESDIR)/$(1); \ - make TARGET=$(2) CPUREV=xB clean && make CPUREV=xB TARGET=$(2)) > \ + export STM32W_CPUREV=CC; \ + make TARGET=$(2) clean && make TARGET=$(2)) > \ $(3)-$(subst /,-,$(1))$(2).report 2>&1 && \ (echo $(1) $(2): OK | tee $(3)-$(subst /,-,$(1))$(2).summary) || \ (echo $(1) $(2): FAIL ಠ.ಠ | tee $(3)-$(subst /,-,$(1))$(2).summary ; \