deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Some little refactor

Browse source
This commit is contained in:
stefano pascali 2013-07-15 18:22:07 +02:00 committed by ismb-pert
parent b43ce0f677
commit 36e7db42de
6 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cpu/stm32w108/Makefile.stm32w108
View file

@ -98,14 +98,14 @@ ifndef DEBUG
OPTI = -Os -ffunction-sections OPTI = -Os -ffunction-sections
endif endif
ifeq ($(CPUREV), CC) ifeq ($(STM32W_CPUREV), CC)
LD-EXT=-stm32w108CC LD-EXT=-stm32w108CC
${warning "using stm32w108CC specific ld file"} ${warning "using stm32w108CC specific ld file"}
else ifeq ($(CPUREV), xB) else ifeq ($(STM32W_CPUREV), xB)
LD-EXT=-stm32w108xB LD-EXT=-stm32w108xB
${warning "using stm32w108xB specific ld file"} ${warning "using stm32w108xB specific ld file"}
else 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 endif
CFLAGSNO = -mthumb -mcpu=cortex-m3 -D "PLATFORM_HEADER=\"hal/micro/cortexm3/compiler/gnu.h\"" \ CFLAGSNO = -mthumb -mcpu=cortex-m3 -D "PLATFORM_HEADER=\"hal/micro/cortexm3/compiler/gnu.h\"" \

10
cpu/stm32w108/README.txt
View file

@ -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. 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: Examples:
The MB851RevD board has a cpu with code The MB851RevD board has a cpu with code
stm32w 108CCU7 stm32w 108CCU7
so CC is your CPUREV value and the command is so CC is your STM32W_CPUREV value and the command is
make TARGET=mbxxx CPUREV=CC ... make TARGET=mbxxx STM32W_CPUREV=CC ...
or or
The MB851RevC board has a cpu with code The MB851RevC board has a cpu with code
stm32w 108CBU6 stm32w 108CBU6
so xB is your CPUREV value. so xB is your STM32W_CPUREV value.
make TARGET=mbxxx CPUREV=xB ... make TARGET=mbxxx STM32W_CPUREV=xB ...
NOTE: if the last word is B you need to use x as wildcard. NOTE: if the last word is B you need to use x as wildcard.

1
platform/mbxxx/dev/contact-sensor.c
View file

@ -41,6 +41,7 @@
* Contact sensor. * Contact sensor.
* \author * \author
* Stefano Pascali <stefano.pascali@st.com> * Stefano Pascali <stefano.pascali@st.com>
* Marco Grella <marco.grella@st.com>
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

1
platform/mbxxx/dev/contact-sensor.h
View file

@ -41,6 +41,7 @@
* Contact magnetic sensor header file. * Contact magnetic sensor header file.
* \author * \author
* Stefano Pascali <stefano.pascali@st.com> * Stefano Pascali <stefano.pascali@st.com>
* Marco Grella <marco.grella@st.com>
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

1
platform/mbxxx/platform-conf.h
View file

@ -44,6 +44,7 @@
* Platform-conf.h for MBXXX. * Platform-conf.h for MBXXX.
* \author * \author
* Stefano Pascali <stefano.pascali@st.com> * Stefano Pascali <stefano.pascali@st.com>
* Marco Grella <marco.grella@st.com>
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

3
regression-tests/Makefile.compile-test
View file

@ -40,7 +40,8 @@ addzero = $(if $(call gt,${nine},$(1)),$(words ${1}),0$(words ${1}))
define dooneexample define dooneexample
@echo Building example $(3): $(1) for target $(2) @echo Building example $(3): $(1) for target $(2)
@((cd $(EXAMPLESDIR)/$(1); \ @((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 && \ $(3)-$(subst /,-,$(1))$(2).report 2>&1 && \
(echo $(1) $(2): OK | tee $(3)-$(subst /,-,$(1))$(2).summary) || \ (echo $(1) $(2): OK | tee $(3)-$(subst /,-,$(1))$(2).summary) || \
(echo $(1) $(2): FAIL ಠ.ಠ | tee $(3)-$(subst /,-,$(1))$(2).summary ; \ (echo $(1) $(2): FAIL ಠ.ಠ | tee $(3)-$(subst /,-,$(1))$(2).summary ; \