annoying but necessary changes
This commit is contained in:
parent
6287839680
commit
ac549216de
|
@ -76,6 +76,17 @@ set(FSFW_ADDITIONAL_INC_PATHS
|
||||||
"FSFW configuration paths"
|
"FSFW configuration paths"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if(TGT_BSP MATCHES "arm/stm32h743zi-nucleo")
|
||||||
|
# TODO: This works but is a horrible mess. In the future, stm32-cmake support will be used and
|
||||||
|
# linked against, so we have a clean interface which can be used by FSFW HAL.
|
||||||
|
set(FSFW_HAL_ADDITIONAL_INC_PATHS
|
||||||
|
${BOARD_CONFIG_PATH}
|
||||||
|
"${BSP_PATH}/STM32CubeH7/Drivers/BSP/STM32H7xx_Nucleo"
|
||||||
|
CACHE STRING
|
||||||
|
"FSFW HAL configuration paths"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
configure_file(${COMMON_CONFIG_PATH}/commonConfig.h.in commonConfig.h)
|
configure_file(${COMMON_CONFIG_PATH}/commonConfig.h.in commonConfig.h)
|
||||||
configure_file(${FSFW_CONFIG_PATH}/FSFWConfig.h.in FSFWConfig.h)
|
configure_file(${FSFW_CONFIG_PATH}/FSFWConfig.h.in FSFWConfig.h)
|
||||||
configure_file(${FSFW_CONFIG_PATH}/OBSWConfig.h.in OBSWConfig.h)
|
configure_file(${FSFW_CONFIG_PATH}/OBSWConfig.h.in OBSWConfig.h)
|
||||||
|
|
|
@ -84,8 +84,8 @@ if(${TGT_BSP} MATCHES "arm/stm32h743zi-nucleo")
|
||||||
CACHE STRING
|
CACHE STRING
|
||||||
"FreeRTOS configuration and port paths."
|
"FreeRTOS configuration and port paths."
|
||||||
)
|
)
|
||||||
|
|
||||||
set(FREERTOS_PORT_SOURCES
|
set(FREERTOS_PORT_SOURCES
|
||||||
${FREERTOS_PORT_PATH}/port.c
|
${FREERTOS_PORT_PATH}/port.c
|
||||||
CACHE INTERNAL
|
CACHE INTERNAL
|
||||||
"FreeRTOS port sources"
|
"FreeRTOS port sources"
|
||||||
|
@ -93,19 +93,32 @@ if(${TGT_BSP} MATCHES "arm/stm32h743zi-nucleo")
|
||||||
set(LIB_STM_HAL_NAME "stm_hal" CACHE STRING "STM32 HAL library name")
|
set(LIB_STM_HAL_NAME "stm_hal" CACHE STRING "STM32 HAL library name")
|
||||||
set(LIB_HAL_NAME ${LIB_STM_HAL_NAME} PARENT_SCOPE)
|
set(LIB_HAL_NAME ${LIB_STM_HAL_NAME} PARENT_SCOPE)
|
||||||
set(LINK_HAL TRUE PARENT_SCOPE)
|
set(LINK_HAL TRUE PARENT_SCOPE)
|
||||||
|
|
||||||
|
set(STM_HAL_CONFIG_PATH
|
||||||
|
"${BOARD_CONFIG_PATH}"
|
||||||
|
CACHE INTERNAL
|
||||||
|
"STM HAL config path."
|
||||||
|
)
|
||||||
|
|
||||||
set(STM_HAL_CONFIG_PATH
|
set(STM_HAL_DEFINES
|
||||||
"${BOARD_CONFIG_PATH}"
|
"USE_HAL_DRIVER"
|
||||||
CACHE INTERNAL
|
"STM32H743xx"
|
||||||
"STM HAL config path."
|
CACHE INTERNAL
|
||||||
)
|
"HAL defines for target machine"
|
||||||
|
)
|
||||||
|
|
||||||
set(STM_HAL_DEFINES
|
set(FSFW_HAL_DEFINES
|
||||||
"USE_HAL_DRIVER"
|
${STM_HAL_DEFINES}
|
||||||
"STM32H743xx"
|
CACHE INTERNAL
|
||||||
CACHE INTERNAL
|
"Defines for FSFW HAL"
|
||||||
"HAL defines for target machine"
|
)
|
||||||
)
|
|
||||||
|
set(FSFW_HAL_LINK_LIBS
|
||||||
|
${LIB_OS_NAME}
|
||||||
|
${LIB_STM_HAL_NAME}
|
||||||
|
CACHE INTERNAL
|
||||||
|
"Link FSFW HAL against OS"
|
||||||
|
)
|
||||||
|
|
||||||
set(LINKER_SCRIPT_PATH "${BSP_PATH}/STM32CubeH7/Boards/NUCLEO-H743ZI")
|
set(LINKER_SCRIPT_PATH "${BSP_PATH}/STM32CubeH7/Boards/NUCLEO-H743ZI")
|
||||||
set(LINKER_SCRIPT_NAME "STM32H743ZITx_FLASH.ld")
|
set(LINKER_SCRIPT_NAME "STM32H743ZITx_FLASH.ld")
|
||||||
|
|
2
fsfw_hal
2
fsfw_hal
|
@ -1 +1 @@
|
||||||
Subproject commit d194b759c4781f6384786010c460382de97830c2
|
Subproject commit 04166f87d82f3729b4462437677bae9105c1c88e
|
Reference in New Issue
Block a user