zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9233 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
Giovanni Di Sirio 2016-04-03 10:58:22 +00:00
parent 8b133b8c18
commit e558e86d74
24 changed files with 60 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/hal/hal.mk
View File

@ -1,7 +1,7 @@
# List of all the ChibiOS/HAL files, there is no need to remove the files # List of all the ChibiOS/HAL files, there is no need to remove the files
# from this list, you can disable parts of the HAL by editing halconf.h. # from this list, you can disable parts of the HAL by editing halconf.h.
ifeq ($(USE_SMART_BUILD),yes) ifeq ($(USE_SMART_BUILD),yes)
HALCONF := $(strip $(shell cat halconf.h | egrep -e "define")) HALCONF := $(strip $(shell cat halconf.h | egrep -e "\#define"))
HALSRC := $(CHIBIOS)/os/hal/src/hal.c \ HALSRC := $(CHIBIOS)/os/hal/src/hal.c \
$(CHIBIOS)/os/hal/src/hal_st.c \ $(CHIBIOS)/os/hal/src/hal_st.c \

2
os/hal/ports/STM32/STM32F0xx/platform.mk
View File

@ -1,6 +1,6 @@
# List of all the STM32F0xx platform files. # List of all the STM32F0xx platform files.
ifeq ($(USE_SMART_BUILD),yes) ifeq ($(USE_SMART_BUILD),yes)
HALCONF := $(strip $(shell cat halconf.h | egrep -e "define")) HALCONF := $(strip $(shell cat halconf.h | egrep -e "\#define"))
PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \
$(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/hal_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/hal_lld.c \

2
os/hal/ports/STM32/STM32F1xx/platform.mk
View File

@ -1,6 +1,6 @@
# List of all the STM32F1xx platform files. # List of all the STM32F1xx platform files.
ifeq ($(USE_SMART_BUILD),yes) ifeq ($(USE_SMART_BUILD),yes)
HALCONF := $(strip $(shell cat halconf.h | egrep -e "define")) HALCONF := $(strip $(shell cat halconf.h | egrep -e "\#define"))
PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \
$(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/hal_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/hal_lld.c \

2
os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk
View File

@ -1,6 +1,6 @@
# List of all the STM32F1xx platform files. # List of all the STM32F1xx platform files.
ifeq ($(USE_SMART_BUILD),yes) ifeq ($(USE_SMART_BUILD),yes)
HALCONF := $(strip $(shell cat halconf.h | egrep -e "define")) HALCONF := $(strip $(shell cat halconf.h | egrep -e "\#define"))
PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \
$(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/hal_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/hal_lld.c \

2
os/hal/ports/STM32/STM32F37x/platform.mk
View File

@ -1,6 +1,6 @@
# List of all the STM32F37x platform files. # List of all the STM32F37x platform files.
ifeq ($(USE_SMART_BUILD),yes) ifeq ($(USE_SMART_BUILD),yes)
HALCONF := $(strip $(shell cat halconf.h | egrep -e "define")) HALCONF := $(strip $(shell cat halconf.h | egrep -e "\#define"))
PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \
$(CHIBIOS)/os/hal/ports/STM32/STM32F37x/hal_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/hal_lld.c \

2
os/hal/ports/STM32/STM32F3xx/platform.mk
View File

@ -1,6 +1,6 @@
# List of all the STM32F3xx platform files. # List of all the STM32F3xx platform files.
ifeq ($(USE_SMART_BUILD),yes) ifeq ($(USE_SMART_BUILD),yes)
HALCONF := $(strip $(shell cat halconf.h | egrep -e "define")) HALCONF := $(strip $(shell cat halconf.h | egrep -e "\#define"))
PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \
$(CHIBIOS)/os/hal/ports/STM32/STM32F3xx/hal_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32F3xx/hal_lld.c \

2
os/hal/ports/STM32/STM32F4xx/platform.mk
View File

@ -1,6 +1,6 @@
# List of all the STM32F2xx/STM32F4xx platform files. # List of all the STM32F2xx/STM32F4xx platform files.
ifeq ($(USE_SMART_BUILD),yes) ifeq ($(USE_SMART_BUILD),yes)
HALCONF := $(strip $(shell cat halconf.h | egrep -e "define")) HALCONF := $(strip $(shell cat halconf.h | egrep -e "\#define"))
PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \
$(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/hal_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/hal_lld.c \

2
os/hal/ports/STM32/STM32F7xx/platform.mk
View File

@ -1,6 +1,6 @@
# List of all the STM32F7xx platform files. # List of all the STM32F7xx platform files.
ifeq ($(USE_SMART_BUILD),yes) ifeq ($(USE_SMART_BUILD),yes)
HALCONF := $(strip $(shell cat halconf.h | egrep -e "define")) HALCONF := $(strip $(shell cat halconf.h | egrep -e "\#define"))
PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \
$(CHIBIOS)/os/hal/ports/STM32/STM32F7xx/hal_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32F7xx/hal_lld.c \

2
os/hal/ports/STM32/STM32L0xx/platform.mk
View File

@ -1,6 +1,6 @@
# List of all the STM32L0xx platform files. # List of all the STM32L0xx platform files.
ifeq ($(USE_SMART_BUILD),yes) ifeq ($(USE_SMART_BUILD),yes)
HALCONF := $(strip $(shell cat halconf.h | egrep -e "define")) HALCONF := $(strip $(shell cat halconf.h | egrep -e "\#define"))
PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \
$(CHIBIOS)/os/hal/ports/STM32/LLD/DMAv1/stm32_dma.c \ $(CHIBIOS)/os/hal/ports/STM32/LLD/DMAv1/stm32_dma.c \

2
os/hal/ports/STM32/STM32L1xx/platform.mk
View File

@ -1,6 +1,6 @@
# List of all the STM32L1xx platform files. # List of all the STM32L1xx platform files.
ifeq ($(USE_SMART_BUILD),yes) ifeq ($(USE_SMART_BUILD),yes)
HALCONF := $(strip $(shell cat halconf.h | egrep -e "define")) HALCONF := $(strip $(shell cat halconf.h | egrep -e "\#define"))
PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \
$(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/hal_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/hal_lld.c \

2
os/hal/ports/STM32/STM32L4xx/platform.mk
View File

@ -1,6 +1,6 @@
# List of all the STM32L4xx platform files. # List of all the STM32L4xx platform files.
ifeq ($(USE_SMART_BUILD),yes) ifeq ($(USE_SMART_BUILD),yes)
HALCONF := $(strip $(shell cat halconf.h | egrep -e "define")) HALCONF := $(strip $(shell cat halconf.h | egrep -e "\#define"))
PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \
$(CHIBIOS)/os/hal/ports/STM32/STM32L4xx/hal_lld.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32L4xx/hal_lld.c \

6
os/hal/templates/platform.mk → os/hal/ports/common/platform.mk
View File

@ -6,15 +6,19 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/templates/hal_lld.c \
${CHIBIOS}/os/hal/templates/hal_ext_lld.c \ ${CHIBIOS}/os/hal/templates/hal_ext_lld.c \
${CHIBIOS}/os/hal/templates/hal_gpt_lld.c \ ${CHIBIOS}/os/hal/templates/hal_gpt_lld.c \
${CHIBIOS}/os/hal/templates/hal_i2c_lld.c \ ${CHIBIOS}/os/hal/templates/hal_i2c_lld.c \
${CHIBIOS}/os/hal/templates/hal_i2s_lld.c \
${CHIBIOS}/os/hal/templates/hal_icu_lld.c \ ${CHIBIOS}/os/hal/templates/hal_icu_lld.c \
${CHIBIOS}/os/hal/templates/hal_mac_lld.c \ ${CHIBIOS}/os/hal/templates/hal_mac_lld.c \
${CHIBIOS}/os/hal/templates/hal_pal_lld.c \ ${CHIBIOS}/os/hal/templates/hal_pal_lld.c \
${CHIBIOS}/os/hal/templates/hal_pwm_lld.c \ ${CHIBIOS}/os/hal/templates/hal_pwm_lld.c \
${CHIBIOS}/os/hal/templates/hal_rtc_lld.c \
${CHIBIOS}/os/hal/templates/hal_sdc_lld.c \ ${CHIBIOS}/os/hal/templates/hal_sdc_lld.c \
${CHIBIOS}/os/hal/templates/hal_serial_lld.c \ ${CHIBIOS}/os/hal/templates/hal_serial_lld.c \
${CHIBIOS}/os/hal/templates/hal_spi_lld.c \ ${CHIBIOS}/os/hal/templates/hal_spi_lld.c \
${CHIBIOS}/os/hal/templates/hal_st_lld.c \
${CHIBIOS}/os/hal/templates/hal_uart_lld.c \ ${CHIBIOS}/os/hal/templates/hal_uart_lld.c \
${CHIBIOS}/os/hal/templates/hal_usb_lld.c ${CHIBIOS}/os/hal/templates/hal_usb_lld.c \
${CHIBIOS}/os/hal/templates/hal_wdg_lld.c
# Required include directories # Required include directories
PLATFORMINC = ${CHIBIOS}/os/hal/templates PLATFORMINC = ${CHIBIOS}/os/hal/templates

24
os/hal/templates/board/board.c Normal file
View File

@ -0,0 +1,24 @@
/*
ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
#include "hal.h"
/**
* @brief Board-specific initialization code.
* @todo Add your board-specific code, if any.
*/
void boardInit(void) {
}

0
test/hal/testbuild/board.h → os/hal/templates/board/board.h
View File

5
os/hal/templates/board/board.mk Normal file
View File

@ -0,0 +1,5 @@
# List of all the board related files.
BOARDSRC = $(CHIBIOS)/os/hal/templates/board/board.c
# Required include directories
BOARDINC = $(CHIBIOS)/os/hal/templates/board

1
os/hal/templates/hal_i2s_lld.c
View File

@ -84,6 +84,7 @@ void i2s_lld_start(I2SDriver *i2sp) {
} }
#endif #endif
}
} }
/** /**

5
os/hal/templates/hal_wdg_lld.c
View File

@ -34,7 +34,7 @@
/* Driver exported variables. */ /* Driver exported variables. */
/*===========================================================================*/ /*===========================================================================*/
#if STM32_WDG_USE_WDG1 || defined(__DOXYGEN__) #if PLATFORM_WDG_USE_WDG1 || defined(__DOXYGEN__)
WDGDriver WDGD1; WDGDriver WDGD1;
#endif #endif
@ -72,6 +72,7 @@ void wdg_lld_init(void) {
*/ */
void wdg_lld_start(WDGDriver *wdgp) { void wdg_lld_start(WDGDriver *wdgp) {
(void)wdgp;
} }
/** /**
@ -83,6 +84,7 @@ void wdg_lld_start(WDGDriver *wdgp) {
*/ */
void wdg_lld_stop(WDGDriver *wdgp) { void wdg_lld_stop(WDGDriver *wdgp) {
(void)wdgp;
} }
/** /**
@ -94,6 +96,7 @@ void wdg_lld_stop(WDGDriver *wdgp) {
*/ */
void wdg_lld_reset(WDGDriver * wdgp) { void wdg_lld_reset(WDGDriver * wdgp) {
(void)wdgp;
} }
#endif /* HAL_USE_WDG */ #endif /* HAL_USE_WDG */

2
os/nil/nil.mk
View File

@ -1,7 +1,7 @@
# List of all the ChibiOS/NIL kernel files, there is no need to remove the files # List of all the ChibiOS/NIL kernel files, there is no need to remove the files
# from this list, you can disable parts of the kernel by editing chconf.h. # from this list, you can disable parts of the kernel by editing chconf.h.
ifeq ($(USE_SMART_BUILD),yes) ifeq ($(USE_SMART_BUILD),yes)
CHCONF := $(strip $(shell cat chconf.h | egrep -e "define")) CHCONF := $(strip $(shell cat chconf.h | egrep -e "\#define"))
KERNSRC := ${CHIBIOS}/os/nil/src/ch.c KERNSRC := ${CHIBIOS}/os/nil/src/ch.c
ifneq ($(findstring CH_CFG_USE_MAILBOXES TRUE,$(CHCONF)),) ifneq ($(findstring CH_CFG_USE_MAILBOXES TRUE,$(CHCONF)),)
KERNSRC += $(CHIBIOS)/os/common/oslib/src/chmboxes.c KERNSRC += $(CHIBIOS)/os/common/oslib/src/chmboxes.c

2
os/rt/rt.mk
View File

@ -1,7 +1,7 @@
# List of all the ChibiOS/RT kernel files, there is no need to remove the files # List of all the ChibiOS/RT kernel files, there is no need to remove the files
# from this list, you can disable parts of the kernel by editing chconf.h. # from this list, you can disable parts of the kernel by editing chconf.h.
ifeq ($(USE_SMART_BUILD),yes) ifeq ($(USE_SMART_BUILD),yes)
CHCONF := $(strip $(shell cat chconf.h | egrep -e "define")) CHCONF := $(strip $(shell cat chconf.h | egrep -e "\#define"))
KERNSRC := $(CHIBIOS)/os/rt/src/chsys.c \ KERNSRC := $(CHIBIOS)/os/rt/src/chsys.c \
$(CHIBIOS)/os/rt/src/chdebug.c \ $(CHIBIOS)/os/rt/src/chdebug.c \

4
test/hal/testbuild/Makefile
View File

@ -91,8 +91,8 @@ CHIBIOS = ../../..
include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
# HAL-OSAL files (optional). # HAL-OSAL files (optional).
include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/templates/platform.mk include $(CHIBIOS)/os/hal/ports/common/platform.mk
#include $(CHIBIOS)/os/hal/boards/xxxxxxx/board.mk include $(CHIBIOS)/os/hal/templates/board/board.mk
include $(CHIBIOS)/os/hal/templates/osal/osal.mk include $(CHIBIOS)/os/hal/templates/osal/osal.mk
# RTOS files (optional). # RTOS files (optional).
#include $(CHIBIOS)/os/rt/rt.mk #include $(CHIBIOS)/os/rt/rt.mk

2
test/hal/testbuild/main.c
View File

@ -24,5 +24,7 @@ int main(int argc, char *argv[]) {
(void)argc; (void)argc;
(void)argv; (void)argv;
halInit();
return 0; return 0;
} }

2
test/rt/testbuild/Makefile
View File

@ -41,7 +41,7 @@ endif
# If enabled, this option makes the build process faster by not compiling # If enabled, this option makes the build process faster by not compiling
# modules not used in the current configuration. # modules not used in the current configuration.
ifeq ($(USE_SMART_BUILD),) ifeq ($(USE_SMART_BUILD),)
USE_SMART_BUILD = yes USE_SMART_BUILD = no
endif endif
# #

2
test/rt/testbuild/chconf.h
View File

@ -463,7 +463,7 @@
* tickless mode. * tickless mode.
*/ */
#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXIGEN__) #if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXIGEN__)
#define CH_DBG_THREADS_PROFILING FALSE #define CH_DBG_THREADS_PROFILING TRUE
#endif #endif
/** @} */ /** @} */

4
test/rt/testbuild/go.sh
View File

@ -112,11 +112,11 @@ test cfg22 "-DCH_DBG_STATISTICS=TRUE"
test cfg23 "-DCH_DBG_SYSTEM_STATE_CHECK=TRUE" test cfg23 "-DCH_DBG_SYSTEM_STATE_CHECK=TRUE"
test cfg24 "-DCH_DBG_ENABLE_CHECKS=TRUE" test cfg24 "-DCH_DBG_ENABLE_CHECKS=TRUE"
test cfg25 "-DCH_DBG_ENABLE_ASSERTS=TRUE" test cfg25 "-DCH_DBG_ENABLE_ASSERTS=TRUE"
test cfg26 "-DCH_DBG_ENABLE_TRACE=TRUE" test cfg26 "-DCH_DBG_TRACE_MASK=CH_DBG_TRACE_MASK_ALL"
#test cfg27 "-DCH_DBG_ENABLE_STACK_CHECK=TRUE" #test cfg27 "-DCH_DBG_ENABLE_STACK_CHECK=TRUE"
test cfg28 "-DCH_DBG_FILL_THREADS=TRUE" test cfg28 "-DCH_DBG_FILL_THREADS=TRUE"
test cfg29 "-DCH_DBG_THREADS_PROFILING=FALSE" test cfg29 "-DCH_DBG_THREADS_PROFILING=FALSE"
test cfg30 "-DCH_DBG_SYSTEM_STATE_CHECK=TRUE -DCH_DBG_ENABLE_CHECKS=TRUE -DCH_DBG_ENABLE_ASSERTS=TRUE -DCH_DBG_ENABLE_TRACE=TRUE -DCH_DBG_FILL_THREADS=TRUE" test cfg30 "-DCH_DBG_SYSTEM_STATE_CHECK=TRUE -DCH_DBG_ENABLE_CHECKS=TRUE -DCH_DBG_ENABLE_ASSERTS=TRUE -DCH_DBG_TRACE_MASK=CH_DBG_TRACE_MASK_ALL -DCH_DBG_FILL_THREADS=TRUE"
rm *log.txt 2> /dev/null rm *log.txt 2> /dev/null
echo echo