Skip to content

Commit

Permalink
🚧 Migrate ChibiOS to v19.1 🚧 (#1206)
Browse files Browse the repository at this point in the history
WIP, TODO:
[ ] update board_sources.cmake for H7 & L0 boards
[ ] test all reference boards with samples
[ ] raise an issue to swap to HAL_USE_TRNG and hardware crypto lib
[ ] Closes nanoframework/Home#446.
  • Loading branch information
networkfusion authored and josesimoes committed Mar 14, 2019
1 parent 35b8ccb commit bcf5ec5
Show file tree
Hide file tree
Showing 31 changed files with 820 additions and 424 deletions.
2 changes: 1 addition & 1 deletion CMake/ChibiOS.CMakeLists.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ExternalProject_Add(
ChibiOS
PREFIX ChibiOS
SOURCE_DIR ${CMAKE_BINARY_DIR}/ChibiOS_Source
GIT_REPOSITORY https://github.com/nanoframework/ChibiOS
GIT_REPOSITORY https://github.com/nanoframework/chibios
GIT_TAG ${CHIBIOS_GIT_TAG} # target specified branch
GIT_SHALLOW 1 # download only the tip of the branch, not the complete history
TIMEOUT 10
Expand Down
14 changes: 10 additions & 4 deletions CMake/Modules/CHIBIOS_STM32F0xx_sources.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,26 @@ set(CHIBIOS_PORT_SRCS

hal_adc_lld.c
hal_can_lld.c
#hal_dac_lld.c
hal_dac_lld.c
stm32_dma.c
hal_ext_lld.c
stm32_exti.c
hal_pal_lld.c
hal_i2c_lld.c
hal_rtc_lld.c

hal_i2s_lld.c
hal_spi_lld.c

hal_st_lld.c
hal_gpt_lld.c
hal_icu_lld.c
hal_pwm_lld.c

hal_serial_lld.c
hal_uart_lld.c

hal_usb_lld.c

hal_wdg_lld.c

# RT
Expand All @@ -57,7 +63,7 @@ foreach(SRC_FILE ${CHIBIOS_PORT_SRCS})
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/STM32F0xx
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/ADCv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/CANv1
#${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DACv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DACv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DMAv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/EXTIv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/GPIOv2
Expand All @@ -83,7 +89,7 @@ list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/common/

list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/ADCv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/CANv1)
#list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DACv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DACv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DMAv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/EXTIv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/GPIOv2)
Expand Down
87 changes: 49 additions & 38 deletions CMake/Modules/CHIBIOS_STM32F4xx_sources.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,40 +11,47 @@
################################################################################################

set(CHIBIOS_PORT_SRCS
# startup code
crt1.c
vectors.S
crt0_v7m.S

nvic.c
stm32_isr.c
hal_lld.c

hal_adc_lld.c
hal_can_lld.c
#hal_dac_lld.c
stm32_dma.c
hal_ext_lld.c
hal_pal_lld.c
hal_i2c_lld.c
hal_mac_lld.c
hal_rtc_lld.c
hal_sdc_lld.c
#hal_i2s_lld.c
hal_spi_lld.c
hal_st_lld.c
hal_gpt_lld.c
hal_icu_lld.c
hal_pwm_lld.c
hal_serial_lld.c
hal_uart_lld.c
hal_usb_lld.c
hal_wdg_lld.c

# RT
chcore.c
chcore_v7m.c
chcoreasm_v7m.S
# startup code
crt1.c
vectors.S
crt0_v7m.S

nvic.c
stm32_isr.c
hal_lld.c

hal_adc_lld.c
hal_can_lld.c
hal_crypto_lld.c
hal_dac_lld.c
stm32_dma.c
stm32_exti.c
hal_pal_lld.c
hal_i2c_lld.c
hal_mac_lld.c
hal_usb_lld.c
hal_wspi_lld.c
hal_trng_lld.c
hal_rtc_lld.c
hal_sdc_lld.c

hal_i2s_lld.c
hal_spi_lld.c

hal_st_lld.c
hal_gpt_lld.c
hal_icu_lld.c
hal_pwm_lld.c

hal_serial_lld.c
hal_uart_lld.c

hal_wdg_lld.c

# RT
chcore.c
chcore_v7m.c
chcoreasm_v7m.S
)

foreach(SRC_FILE ${CHIBIOS_PORT_SRCS})
Expand All @@ -60,19 +67,21 @@ foreach(SRC_FILE ${CHIBIOS_PORT_SRCS})
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/STM32F4xx
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/ADCv2
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/CANv1
#${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DACv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/CRYPv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DACv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DMAv2
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/EXTIv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/GPIOv2
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/I2Cv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/MACv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/OTGv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/QUADSPIv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/RNGv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/RTCv2
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/SDIOv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/SPIv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/TIMv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/USARTv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/USBv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/xWDGv1

CMAKE_FIND_ROOT_PATH_BOTH
Expand All @@ -89,19 +98,21 @@ list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/common/

list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/ADCv2)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/CANv1)
#list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DACv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/CRYPv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DACv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DMAv2)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/EXTIv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/GPIOv2)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/I2Cv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/MACv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/OTGv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/QUADSPIv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/RNGv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/RTCv2)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/SDIOv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/SPIv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/TIMv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/USARTv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/USBv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/xWDGv1)


Expand Down
28 changes: 20 additions & 8 deletions CMake/Modules/CHIBIOS_STM32F7xx_sources.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,30 @@ set(CHIBIOS_PORT_SRCS

hal_adc_lld.c
hal_can_lld.c
#hal_dac_lld.c
hal_crypto_lld.c
hal_dac_lld.c
stm32_dma.c
hal_ext_lld.c
stm32_exti.c
hal_pal_lld.c
hal_i2c_lld.c
hal_mac_lld.c
hal_usb_lld.c
hal_wspi_lld.c
hal_trng_lld.c
hal_rtc_lld.c
hal_sdc_lld.c
#hal_i2s_lld.c

hal_i2s_lld.c
hal_spi_lld.c

hal_st_lld.c
hal_gpt_lld.c
hal_icu_lld.c
hal_pwm_lld.c

hal_serial_lld.c
hal_uart_lld.c
hal_usb_lld.c

hal_wdg_lld.c

# RT
Expand All @@ -58,21 +65,24 @@ foreach(SRC_FILE ${CHIBIOS_PORT_SRCS})
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/common/ARMCMx

${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/STM32F7xx

${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/ADCv2
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/CANv1
#${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DACv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/CRYPv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DACv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DMAv2
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/EXTIv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/GPIOv2
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/I2Cv2
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/MACv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/OTGv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/QUADSPIv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/RNGv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/RTCv2
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/SDMMCv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/SPIv2
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/TIMv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/USARTv2
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/USBv1
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/xWDGv1

CMAKE_FIND_ROOT_PATH_BOTH
Expand All @@ -89,19 +99,21 @@ list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/common/

list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/ADCv2)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/CANv1)
#list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DACv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/CRYPv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DACv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/DMAv2)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/EXTIv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/GPIOv2)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/I2Cv2)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/MACv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/OTGv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/QUADSPIv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/RNGv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/RTCv2)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/SDMMCv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/SPIv2)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/TIMv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/USARTv2)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/USBv1)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/LLD/xWDGv1)


Expand Down
20 changes: 12 additions & 8 deletions CMake/Modules/FindCHIBIOS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/por
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/include)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/boards/${CHIBIOS_BOARD})
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/osal/rt)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/common/oslib/include)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/oslib/include)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/rt/include)
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/ports/STM32/${TARGET_SERIES})
list(APPEND CHIBIOS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ChibiOS_Source/os/common/ports/ARMCMx)
Expand Down Expand Up @@ -67,7 +67,7 @@ set(CHIBIOS_SRCS
hal_can.c
hal_crypto.c
hal_dac.c
hal_ext.c
#hal_ext.c #notfound
hal_gpt.c
hal_i2c.c
hal_i2s.c
Expand All @@ -76,15 +76,18 @@ set(CHIBIOS_SRCS
hal_mmc_spi.c
hal_pal.c
hal_pwm.c
hal_qspi.c
#hal_qspi.c #notfound
hal_rtc.c
hal_sdc.c
hal_serial.c
hal_serial_usb.c
hal_sio.c #new
hal_spi.c
hal_trng.c #new
hal_uart.c
hal_usb.c
hal_wdg.c
hal_wspi.c #new

# OSAL RT
osal.c
Expand All @@ -98,18 +101,19 @@ set(CHIBIOS_SRCS
chthreads.c
chtm.c
chstats.c
chdynamic.c
chregistry.c
chsem.c
chmtx.c
chcond.c
chevents.c
chmsg.c

chheap.c
chdynamic.c

chmboxes.c
chmemcore.c
chmemheaps.c
chmempools.c
chpipes.c
chfactory.c

# required to use malloc and other newlib stuff
Expand All @@ -130,7 +134,7 @@ foreach(SRC_FILE ${CHIBIOS_SRCS})
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/src
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/hal/osal/rt
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/rt/src
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/common/oslib/src
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/oslib/src
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/common/abstractions/cmsis_os
${PROJECT_BINARY_DIR}/ChibiOS_Source/os/various

Expand All @@ -152,7 +156,7 @@ foreach(SRC_FILE ${CHIBIOS_SRCS})

CMAKE_FIND_ROOT_PATH_BOTH
)
# message("${SRC_FILE} >> ${CHIBIOS_SRC_FILE}") # debug helper
#message("${SRC_FILE} >> ${CHIBIOS_SRC_FILE}") # debug helper
list(APPEND CHIBIOS_SOURCES ${CHIBIOS_SRC_FILE})
endforeach()

Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -662,8 +662,8 @@ if(RTOS_CHIBIOS_CHECK)

if(CHIBIOS_VERSION_EMPTY)
# no ChibiOS version actualy specified, must be empty which is fine, we'll grab the code from the stable_18.2.x branch
message(STATUS "RTOS is: CHIBIOS (latest available code from stable_18.2.x)")
set(CHIBIOS_GIT_TAG "stable_18.2.x")
message(STATUS "RTOS is: CHIBIOS (latest available code from stable_19.1.x)")
set(CHIBIOS_GIT_TAG "stable_19.1.x")
else()
message(STATUS "RTOS is: ChibiRTOS v${CHIBIOS_VERSION}")

Expand Down Expand Up @@ -700,7 +700,7 @@ if(RTOS_CHIBIOS_CHECK)
ChibiOS
PREFIX ChibiOS
SOURCE_DIR ${CMAKE_BINARY_DIR}/ChibiOS_Source
GIT_REPOSITORY https://github.com/nanoframework/ChibiOS
GIT_REPOSITORY https://github.com/nanoframework/chibios
GIT_TAG ${CHIBIOS_GIT_TAG} # target specified branch
GIT_SHALLOW 1 # download only the tip of the branch, not the complete history
TIMEOUT 10
Expand Down
2 changes: 1 addition & 1 deletion VisualStudioDevelopment/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Sometime the CMake server goes away, shutting down Visual Studio and restarting
#### c:\nanoFramework_Tools\
Manually create this directory to contain the following folders.
###### c:\nanoFramework_Tools\ChibiOS
+ Copy of the ChibiOS repository cloned from https://github.com/nanoframework/ChibiOS.git
+ Copy of the ChibiOS repository cloned from https://github.com/nanoframework/chibios.git

###### C:\nanoFramework_Tools\Tools\openocd
+ Copy of the openocd installation http://www.freddiechopin.info/en/download/category/4-openocd
Expand Down
Loading

0 comments on commit bcf5ec5

Please sign in to comment.