Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMake/Modules/CHIBIOS_STM32F4xx_GCC_options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ macro(nf_set_compile_options)


# include any extra options coming from any extra args?
target_compile_options(${NFSCO_TARGET} PUBLIC ${__EXTRA_COMPILE_OPTIONS} -mthumb -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )
target_compile_options(${NFSCO_TARGET} PUBLIC ${NFSCO__EXTRA_COMPILE_OPTIONS} -mthumb -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )

# this series has FPU
target_compile_definitions(${NFSCO_TARGET} PUBLIC -DPLATFORM_ARM -DCORTEX_USE_FPU=TRUE -DUSE_FPU=TRUE)
Expand Down Expand Up @@ -58,7 +58,7 @@ macro(nf_set_linker_options)
nf_include_libraries_in_build(${NFSLO_TARGET})

# set extra linker flags
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${__EXTRA_LINK_FLAGS} ")
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${NFSLO__EXTRA_LINK_FLAGS} ")

# set optimization flags
nf_set_optimization_options(${NFSLO_TARGET})
Expand Down
4 changes: 2 additions & 2 deletions CMake/Modules/CHIBIOS_STM32F7xx_GCC_options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ macro(nf_set_compile_options)

# include any extra options coming from any extra args?
# STMF7 cores have SP and DP, the default is SP. DP can be set if developer realy needs that.
target_compile_options(${NFSCO_TARGET} PUBLIC ${__EXTRA_COMPILE_OPTIONS} -mthumb -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )
target_compile_options(${NFSCO_TARGET} PUBLIC ${NFSCO__EXTRA_COMPILE_OPTIONS} -mthumb -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )

# this series has FPU
target_compile_definitions(${NFSCO_TARGET} PUBLIC -DPLATFORM_ARM -DCORTEX_USE_FPU=TRUE -DUSE_FPU=TRUE)
Expand Down Expand Up @@ -57,7 +57,7 @@ macro(nf_set_linker_options)
nf_include_libraries_in_build(${NFSLO_TARGET})

# set extra linker flags
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${__EXTRA_LINK_FLAGS} ")
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${NFSLO__EXTRA_LINK_FLAGS} ")

# set optimization flags
nf_set_optimization_options(${NFSLO_TARGET})
Expand Down
4 changes: 2 additions & 2 deletions CMake/Modules/CHIBIOS_STM32H7xx_GCC_options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ macro(nf_set_compile_options)

# include any extra options coming from any extra args?
# STMF7 cores have SP and DP, the default is SP. DP can be set if developer realy needs that.
target_compile_options(${NFSCO_TARGET} PUBLIC ${__EXTRA_COMPILE_OPTIONS} -mthumb -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )
target_compile_options(${NFSCO_TARGET} PUBLIC ${NFSCO__EXTRA_COMPILE_OPTIONS} -mthumb -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )

# this series has FPU
target_compile_definitions(${NFSCO_TARGET} PUBLIC -DPLATFORM_ARM -DCORTEX_USE_FPU=TRUE -DUSE_FPU=TRUE)
Expand Down Expand Up @@ -59,7 +59,7 @@ macro(nf_set_linker_options)
nf_include_libraries_in_build(${NFSLO_TARGET})

# set extra linker flags
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${__EXTRA_LINK_FLAGS} ")
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${NFSLO__EXTRA_LINK_FLAGS} ")

# set optimization flags
nf_set_optimization_options(${NFSLO_TARGET})
Expand Down
4 changes: 2 additions & 2 deletions CMake/Modules/CHIBIOS_STM32L0xx_GCC_options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ macro(nf_set_compile_options)


# include any extra options coming from any extra args?
target_compile_options(${NFSCO_TARGET} PUBLIC ${__EXTRA_COMPILE_OPTIONS} -mthumb -mcpu=cortex-m0plus -mfloat-abi=soft -mabi=aapcs -mtune=cortex-m0plus -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )
target_compile_options(${NFSCO_TARGET} PUBLIC ${NFSCO__EXTRA_COMPILE_OPTIONS} -mthumb -mcpu=cortex-m0plus -mfloat-abi=soft -mabi=aapcs -mtune=cortex-m0plus -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -fshort-wchar -fno-builtin -fno-common -mno-long-calls -fno-exceptions -fcheck-new )

# this series doesn't have FPU
target_compile_definitions(${NFSCO_TARGET} PUBLIC -DPLATFORM_ARM -DCORTEX_USE_FPU=FALSE -DUSE_FPU=TRUE)
Expand Down Expand Up @@ -62,7 +62,7 @@ macro(nf_set_linker_options)
nf_include_libraries_in_build(${NFSLO_TARGET})

# set extra linker flags
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${__EXTRA_LINK_FLAGS} ")
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${NFSLO__EXTRA_LINK_FLAGS} ")

# set optimization flags
nf_set_optimization_options(${NFSLO_TARGET})
Expand Down
4 changes: 2 additions & 2 deletions CMake/Modules/CHIBIOS_STM32L4xx_GCC_options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ macro(nf_set_compile_options)


# include any extra options coming from any extra args?
target_compile_options(${NFSCO_TARGET} PUBLIC ${__EXTRA_COMPILE_OPTIONS} -mthumb -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -ffunction-sections -fshort-wchar -falign-functions=16 -fdata-sections -fno-builtin -fno-common -fomit-frame-pointer -mlong-calls -fdollars-in-identifiers -fno-exceptions -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fcheck-new )
target_compile_options(${NFSCO_TARGET} PUBLIC ${NFSCO__EXTRA_COMPILE_OPTIONS} -mthumb -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -ffunction-sections -fshort-wchar -falign-functions=16 -fdata-sections -fno-builtin -fno-common -fomit-frame-pointer -mlong-calls -fdollars-in-identifiers -fno-exceptions -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fcheck-new )

# this series has FPU
target_compile_definitions(${NFSCO_TARGET} PUBLIC -DPLATFORM_ARM -DCORTEX_USE_FPU=TRUE -DUSE_FPU=TRUE)
Expand Down Expand Up @@ -58,7 +58,7 @@ macro(nf_set_linker_options)
nf_include_libraries_in_build(${NFSLO_TARGET})

# set extra linker flags
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${__EXTRA_LINK_FLAGS} ")
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${NFSLO__EXTRA_LINK_FLAGS} ")

# set optimization flags
nf_set_optimization_options(${NFSLO_TARGET})
Expand Down
4 changes: 2 additions & 2 deletions CMake/Modules/FindNF_CoreCLR.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ list(APPEND NF_CoreCLR_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/nanoFramework.Runtim
list(APPEND NF_CoreCLR_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/nanoFramework.System.Collections)
list(APPEND NF_CoreCLR_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/DeviceInterfaces/Networking.Sntp)

list(APPEND NF_CoreCLR_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/targets/${RTOS}/${TARGET_BOARD})
list(APPEND NF_CoreCLR_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/targets/${RTOS}/${TARGET_BOARD}/nanoCLR)
list(APPEND NF_CoreCLR_INCLUDE_DIRS ${TARGET_BASE_LOCATION})
list(APPEND NF_CoreCLR_INCLUDE_DIRS ${TARGET_BASE_LOCATION}/nanoCLR)
list(APPEND NF_CoreCLR_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/targets/${RTOS}/${TARGET_BOARD})
list(APPEND NF_CoreCLR_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/targets/${RTOS}/${TARGET_BOARD}/nanoCLR)

Expand Down
3 changes: 3 additions & 0 deletions CMake/Modules/FindNF_NativeAssemblies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,8 @@ else()
message(STATUS " *** NO APIs included ***")
endif()

list(APPEND NF_NativeAssemblies_INCLUDE_DIRS ${TARGET_BASE_LOCATION})

include(FindPackageHandleStandardArgs)

FIND_PACKAGE_HANDLE_STANDARD_ARGS(NF_NativeAssemblies DEFAULT_MSG NF_NativeAssemblies_INCLUDE_DIRS NF_NativeAssemblies_SOURCES)
Expand All @@ -419,6 +421,7 @@ macro(nf_add_lib_native_assemblies)
PUBLIC
${NF_NativeAssemblies_INCLUDE_DIRS}
${NF_CoreCLR_INCLUDE_DIRS}

${NFALNA_EXTRA_INCLUDES})

# TODO can be removed later
Expand Down
4 changes: 2 additions & 2 deletions CMake/Modules/FreeRTOS_IMXRT10xx_GCC_options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ macro(nf_set_compile_options)

# include any extra options comming from any extra args?
# TODO: removed -Wundef until fix with FatFS is merged (https://github.com/abbrev/fatfs/pull/8)
target_compile_options(${NFSCO_TARGET} PUBLIC ${__EXTRA_COMPILE_OPTIONS} -mthumb -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostdlib -Wall -Wextra -Werror -ffunction-sections -fshort-wchar -falign-functions=16 -fdata-sections -fno-builtin -fno-common -fomit-frame-pointer -mlong-calls -fdollars-in-identifiers -fno-exceptions -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fcheck-new )
target_compile_options(${NFSCO_TARGET} PUBLIC ${NFSCO__EXTRA_COMPILE_OPTIONS} -mthumb -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -mfloat-abi=hard -mabi=aapcs -nostdlib -Wall -Wextra -Werror -ffunction-sections -fshort-wchar -falign-functions=16 -fdata-sections -fno-builtin -fno-common -fomit-frame-pointer -mlong-calls -fdollars-in-identifiers -fno-exceptions -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fcheck-new )

# this series has FPU
target_compile_definitions(${NFSCO_TARGET} PUBLIC -DPLATFORM_ARM -DCORTEX_USE_FPU=TRUE -DUSE_FPU=TRUE)
Expand Down Expand Up @@ -59,7 +59,7 @@ macro(nf_set_linker_options)
nf_include_libraries_in_build(${NFSLO_TARGET})

# set extra linker flags
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${__EXTRA_LINK_FLAGS} ")
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${NFSLO__EXTRA_LINK_FLAGS} ")

# set optimization flags
nf_set_optimization_options(${NFSLO_TARGET})
Expand Down
4 changes: 2 additions & 2 deletions CMake/Modules/TI_SimpleLink_CC13x2_26x2_GCC_options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ macro(nf_set_compile_options)


# include any extra options coming from any extra args?
target_compile_options(${NFSCO_TARGET} PUBLIC ${__EXTRA_COMPILE_OPTIONS} -march=armv7e-m -mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mabi=aapcs -gstrict-dwarf -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -w -static -ffunction-sections -falign-functions=16 -fdata-sections -fno-builtin -fno-common -fsingle-precision-constant -fomit-frame-pointer -mlong-calls -fdollars-in-identifiers -fno-exceptions -fno-unroll-loops -ffast-math -ftree-vectorize -fcheck-new -fno-rtti -fno-use-cxa-atexit -fno-threadsafe-statics)
target_compile_options(${NFSCO_TARGET} PUBLIC ${NFSCO__EXTRA_COMPILE_OPTIONS} -march=armv7e-m -mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mabi=aapcs -gstrict-dwarf -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -w -static -ffunction-sections -falign-functions=16 -fdata-sections -fno-builtin -fno-common -fsingle-precision-constant -fomit-frame-pointer -mlong-calls -fdollars-in-identifiers -fno-exceptions -fno-unroll-loops -ffast-math -ftree-vectorize -fcheck-new -fno-rtti -fno-use-cxa-atexit -fno-threadsafe-statics)

# this series has FPU
target_compile_definitions(${NFSCO_TARGET} PUBLIC -DPLATFORM_ARM -DCORTEX_USE_FPU=TRUE -DUSE_FPU=TRUE)
Expand Down Expand Up @@ -61,7 +61,7 @@ macro(nf_set_linker_options)
nf_include_libraries_in_build(${NFSLO_TARGET})

# set extra linker flags
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${__EXTRA_LINK_FLAGS} ")
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${NFSLO__EXTRA_LINK_FLAGS} ")

# set optimization flags
nf_set_optimization_options(${NFSLO_TARGET})
Expand Down
4 changes: 2 additions & 2 deletions CMake/Modules/TI_SimpleLink_CC32xx_GCC_options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ macro(nf_set_compile_options)


# include any extra options coming from any extra args?
target_compile_options(${NFSCO_TARGET} PUBLIC ${__EXTRA_COMPILE_OPTIONS} -march=armv7e-m -mthumb -mcpu=cortex-m4 -mfloat-abi=soft -mabi=aapcs -gstrict-dwarf -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -w -static -ffunction-sections -falign-functions=16 -fdata-sections -fno-builtin -fno-common -fsingle-precision-constant -fomit-frame-pointer -mlong-calls -fdollars-in-identifiers -fno-exceptions -fno-unroll-loops -ffast-math -ftree-vectorize -fcheck-new -fno-rtti -fno-use-cxa-atexit -fno-threadsafe-statics)
target_compile_options(${NFSCO_TARGET} PUBLIC ${NFSCO__EXTRA_COMPILE_OPTIONS} -march=armv7e-m -mthumb -mcpu=cortex-m4 -mfloat-abi=soft -mabi=aapcs -gstrict-dwarf -nostdlib -Wall -Wextra -Werror -Wundef -Wshadow -Wimplicit-fallthrough -w -static -ffunction-sections -falign-functions=16 -fdata-sections -fno-builtin -fno-common -fsingle-precision-constant -fomit-frame-pointer -mlong-calls -fdollars-in-identifiers -fno-exceptions -fno-unroll-loops -ffast-math -ftree-vectorize -fcheck-new -fno-rtti -fno-use-cxa-atexit -fno-threadsafe-statics)

# this series has FPU
target_compile_definitions(${NFSCO_TARGET} PUBLIC -DPLATFORM_ARM -DCORTEX_USE_FPU=TRUE -DUSE_FPU=TRUE)
Expand Down Expand Up @@ -59,7 +59,7 @@ macro(nf_set_linker_options)
nf_include_libraries_in_build(${NFSLO_TARGET})

# set extra linker flags
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${__EXTRA_LINK_FLAGS} ")
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${NFSLO__EXTRA_LINK_FLAGS} ")

# set optimization flags
nf_set_optimization_options(${NFSLO_TARGET})
Expand Down
42 changes: 0 additions & 42 deletions CMake/binutils.ChibiOS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,6 @@ macro(nf_add_platform_dependencies target)
${TARGET_CHIBIOS_COMMON_INCLUDE_DIRS}
${TARGET_CHIBIOS_NANOCLR_INCLUDE_DIRS}
${chibios_SOURCE_DIR}/os/hal/boards/${TARGET_BOARD})

if(IS_COMMUNITY_TARGET)
target_include_directories(NF_CoreCLR PUBLIC
${CMAKE_SOURCE_DIR}/targets-community/ChibiOS/${TARGET_BOARD}
${CMAKE_SOURCE_DIR}/targets-community/ChibiOS/${TARGET_BOARD}/nanoCLR)

endif()

add_dependencies(${target}.elf nano::NF_CoreCLR)

Expand All @@ -152,13 +145,6 @@ macro(nf_add_platform_dependencies target)
${TARGET_CHIBIOS_NANOCLR_INCLUDE_DIRS}
${chibios_SOURCE_DIR}/os/hal/boards/${TARGET_BOARD})

if(IS_COMMUNITY_TARGET)
target_include_directories(WireProtocol PUBLIC
${CMAKE_SOURCE_DIR}/targets-community/ChibiOS/${TARGET_BOARD}
${CMAKE_SOURCE_DIR}/targets-community/ChibiOS/${TARGET_BOARD}/nanoCLR)

endif()

add_dependencies(${target}.elf nano::WireProtocol)

if(NF_FEATURE_DEBUGGER)
Expand All @@ -173,13 +159,6 @@ macro(nf_add_platform_dependencies target)
${TARGET_CHIBIOS_COMMON_INCLUDE_DIRS}
${TARGET_CHIBIOS_NANOCLR_INCLUDE_DIRS}
${chibios_SOURCE_DIR}/os/hal/boards/${TARGET_BOARD})

if(IS_COMMUNITY_TARGET)
target_include_directories(NF_Debugger PUBLIC
${CMAKE_SOURCE_DIR}/targets-community/ChibiOS/${TARGET_BOARD}
${CMAKE_SOURCE_DIR}/targets-community/ChibiOS/${TARGET_BOARD}/nanoCLR)

endif()

add_dependencies(${target}.elf nano::NF_Debugger)

Expand All @@ -196,13 +175,6 @@ macro(nf_add_platform_dependencies target)
${TARGET_CHIBIOS_COMMON_INCLUDE_DIRS}
${TARGET_CHIBIOS_NANOCLR_INCLUDE_DIRS}
${chibios_SOURCE_DIR}/os/hal/boards/${TARGET_BOARD})

if(IS_COMMUNITY_TARGET)
target_include_directories(NF_NativeAssemblies PUBLIC
${CMAKE_SOURCE_DIR}/targets-community/ChibiOS/${TARGET_BOARD}
${CMAKE_SOURCE_DIR}/targets-community/ChibiOS/${TARGET_BOARD}/nanoCLR)

endif()

add_dependencies(${target}.elf nano::NF_NativeAssemblies)

Expand All @@ -226,13 +198,6 @@ macro(nf_add_platform_dependencies target)
${${TARGET_STM32_CUBE_PACKAGE}_CubePackage_INCLUDE_DIRS}
EXTRA_COMPILE_DEFINITIONS -DHAL_USE_MAC=TRUE)

if(IS_COMMUNITY_TARGET)
target_include_directories(NF_Network PUBLIC
${CMAKE_SOURCE_DIR}/targets-community/ChibiOS/${TARGET_BOARD}
${CMAKE_SOURCE_DIR}/targets-community/ChibiOS/${TARGET_BOARD}/nanoCLR)

endif()

add_dependencies(${target}.elf nano::NF_Network)

endif()
Expand All @@ -257,13 +222,6 @@ macro(nf_add_platform_include_directories target)
${CHIBIOS_LWIP_INCLUDE_DIRS}
${SPIFFS_INCLUDE_DIRS}
)

if(IS_COMMUNITY_TARGET)
target_include_directories(${target}.elf PUBLIC
${CMAKE_SOURCE_DIR}/targets-community/ChibiOS/${TARGET_BOARD}
${CMAKE_SOURCE_DIR}/targets-community/ChibiOS/${TARGET_BOARD}/nanoCLR)

endif()

# includes specific to nanoBooter
if(${target} STREQUAL ${NANOBOOTER_PROJECT_NAME})
Expand Down
35 changes: 0 additions & 35 deletions CMake/binutils.TI_SimpleLink.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,6 @@ macro(nf_add_platform_dependencies target)
${TI_XDCTools_INCLUDE_DIR}
${TARGET_TI_SimpleLink_COMMON_INCLUDE_DIRS}
${TARGET_TI_SimpleLink_NANOCLR_INCLUDE_DIRS})

if(IS_COMMUNITY_TARGET)
target_include_directories(NF_CoreCLR PUBLIC
${CMAKE_SOURCE_DIR}/targets-community/TI_SimpleLink/${TARGET_BOARD}
${CMAKE_SOURCE_DIR}/targets-community/TI_SimpleLink/${TARGET_BOARD}/nanoCLR)

endif()

add_dependencies(${target}.elf nano::NF_CoreCLR)

Expand All @@ -127,13 +120,6 @@ macro(nf_add_platform_dependencies target)
${TI_XDCTools_INCLUDE_DIR}
${TARGET_TI_SimpleLink_COMMON_INCLUDE_DIRS}
${TARGET_TI_SimpleLink_NANOCLR_INCLUDE_DIRS})

if(IS_COMMUNITY_TARGET)
target_include_directories(WireProtocol PUBLIC
${CMAKE_SOURCE_DIR}/targets-community/TI_SimpleLink/${TARGET_BOARD}
${CMAKE_SOURCE_DIR}/targets-community/TI_SimpleLink/${TARGET_BOARD}/nanoCLR)

endif()

add_dependencies(${target}.elf nano::WireProtocol)

Expand All @@ -146,13 +132,6 @@ macro(nf_add_platform_dependencies target)
${TARGET_TI_SimpleLink_NANOCLR_INCLUDE_DIRS})

add_dependencies(${target}.elf nano::NF_Debugger)

if(IS_COMMUNITY_TARGET)
target_include_directories(NF_Debugger PUBLIC
${CMAKE_SOURCE_DIR}/targets-community/TI_SimpleLink/${TARGET_BOARD}
${CMAKE_SOURCE_DIR}/targets-community/TI_SimpleLink/${TARGET_BOARD}/nanoCLR)

endif()

endif()

Expand All @@ -164,13 +143,6 @@ macro(nf_add_platform_dependencies target)
${TARGET_TI_SimpleLink_COMMON_INCLUDE_DIRS}
${TARGET_TI_SimpleLink_NANOCLR_INCLUDE_DIRS})

if(IS_COMMUNITY_TARGET)
target_include_directories(NF_NativeAssemblies PUBLIC
${CMAKE_SOURCE_DIR}/targets-community/TI_SimpleLink/${TARGET_BOARD}
${CMAKE_SOURCE_DIR}/targets-community/TI_SimpleLink/${TARGET_BOARD}/nanoCLR)

endif()

# add dependency from SysConfig and TI RTOS configs (this is required to make sure that the intermediate artifacts are generated in the proper order)
add_dependencies(COPY_TIRTOS_CONFIG SYSCONFIG_TASKS)
add_dependencies(TIRTOS_CONFIG COPY_TIRTOS_CONFIG)
Expand Down Expand Up @@ -213,13 +185,6 @@ macro(nf_add_platform_include_directories target)

)

if(IS_COMMUNITY_TARGET)
target_include_directories(${target}.elf PUBLIC
${CMAKE_SOURCE_DIR}/targets-community/TI_SimpleLink/${TARGET_BOARD}
${CMAKE_SOURCE_DIR}/targets-community/TI_SimpleLink/${TARGET_BOARD}/nanoCLR)

endif()

target_link_libraries(
${NANOCLR_PROJECT_NAME}.elf

Expand Down