made more generic

Author: robamu

RTEMSConfig.cmake

@@ -10,6 +10,9 @@
 
 function(rtems_general_config TARGET_NAME RTEMS_INST RTEMS_BSP)
 
+	set(RTEMS_BSP_LIB_PATH CACHE INTERNAL "")
+	set(RTEMS_BSP_INC_PATH CACHE INTERNAL "")
+	
 	include(${RTEMS_CONFIG_DIRECTORY}/RTEMSGeneric.cmake)
 	rtems_generic_config(${TARGET_NAME} ${RTEMS_INST} ${RTEMS_BSP})
 

RTEMSGeneric.cmake

@@ -103,11 +103,6 @@ message(STATUS "RTEMS linker: ${RTEMS_LINKER}")
 if(${RTEMS_ARCH_NAME} STREQUAL "arm")
     set(CMAKE_SYSTEM_PROCESSOR arm PARENT_SCOPE)
 endif()
-
-target_link_directories(${TARGET_NAME} PUBLIC
-	${RTEMS_BSP_LIB_PATH})
-target_include_directories(${TARGET_NAME} PUBLIC
-	${RTEMS_BSP_INC_PATH})
 
 ###############################################################################
 # Setting variables in upper scope (only the upper scope!)
@@ -118,4 +113,7 @@ set(CMAKE_CXX_COMPILER ${RTEMS_GXX} PARENT_SCOPE)
 set(CMAKE_ASM_COMPILER ${RTEMS_ASM} PARENT_SCOPE)
 set(CMAKE_LINKER ${RTEMS_LINKER} PARENT_SCOPE)
 
+set(RTEMS_BSP_LIB_PATH ${RTEMS_BSP_LIB_PATH} PARENT_SCOPE)
+set(RTEMS_BSP_INC_PATH ${RTEMS_BSP_INC_PATH} PARENT_SCOPE)
+
 endfunction()

RTEMSHardware.cmake

@@ -10,25 +10,32 @@
 function(rtems_hw_config TARGET_NAME RTEMS_INST RTEMS_BSP)
 
 if(RTEMS_BSP STREQUAL "arm/stm32h7")
-target_compile_options(${TARGET_NAME} PUBLIC 
-	-mthumb
-	-mcpu=cortex-m7
+
+set(ABI_FLAGS 
+	-mthumb 
+	-mcpu=cortex-m7 
 	-mfpu=fpv5-d16
 	-mfloat-abi=hard
 )
 
+target_compile_options(${TARGET_NAME} PUBLIC 
+	"${ABI_FLAGS}"
+)
+
+target_include_directories(${TARGET_NAME} PUBLIC
+	"${RTEMS_BSP_INC_PATH}"
+)
+
 target_link_options(${TARGET_NAME} BEFORE PUBLIC 
-	-mthumb
-	-mcpu=cortex-m7
-	-mfpu=fpv5-d16
-	-mfloat-abi=hard
+	"${ABI_FLAGS}"
 )
 
 target_link_options(${TARGET_NAME} PUBLIC
 	-Wl,--gc-sections
 	-Wl,-Bstatic
 	-Wl,-Bdynamic
 	-qrtems
+	-B${RTEMS_BSP_LIB_PATH}
 )
 
 endif()