diff --git a/applications/blinky/configs/freertos_config/CMakeLists.txt b/applications/blinky/configs/freertos_config/CMakeLists.txt index 088f7199..cdc1dc88 100644 --- a/applications/blinky/configs/freertos_config/CMakeLists.txt +++ b/applications/blinky/configs/freertos_config/CMakeLists.txt @@ -16,5 +16,4 @@ target_link_libraries(freertos_config INTERFACE tfm-ns-interface app-config - fri-bsp ) diff --git a/applications/freertos_iot_libraries_tests/configs/freertos_config/CMakeLists.txt b/applications/freertos_iot_libraries_tests/configs/freertos_config/CMakeLists.txt index 95f567a3..a7a2b28c 100644 --- a/applications/freertos_iot_libraries_tests/configs/freertos_config/CMakeLists.txt +++ b/applications/freertos_iot_libraries_tests/configs/freertos_config/CMakeLists.txt @@ -16,5 +16,4 @@ target_link_libraries(freertos_config INTERFACE tfm-ns-interface app-config - fri-bsp ) diff --git a/applications/keyword_detection/configs/freertos_config/CMakeLists.txt b/applications/keyword_detection/configs/freertos_config/CMakeLists.txt index 088f7199..cdc1dc88 100644 --- a/applications/keyword_detection/configs/freertos_config/CMakeLists.txt +++ b/applications/keyword_detection/configs/freertos_config/CMakeLists.txt @@ -16,5 +16,4 @@ target_link_libraries(freertos_config INTERFACE tfm-ns-interface app-config - fri-bsp ) diff --git a/applications/object_detection/configs/freertos_config/CMakeLists.txt b/applications/object_detection/configs/freertos_config/CMakeLists.txt index bf3ae06d..371b4b20 100644 --- a/applications/object_detection/configs/freertos_config/CMakeLists.txt +++ b/applications/object_detection/configs/freertos_config/CMakeLists.txt @@ -16,5 +16,4 @@ target_link_libraries(freertos_config INTERFACE tfm-ns-interface app-config - fri-bsp ) diff --git a/applications/speech_recognition/configs/freertos_config/CMakeLists.txt b/applications/speech_recognition/configs/freertos_config/CMakeLists.txt index 088f7199..cdc1dc88 100644 --- a/applications/speech_recognition/configs/freertos_config/CMakeLists.txt +++ b/applications/speech_recognition/configs/freertos_config/CMakeLists.txt @@ -16,5 +16,4 @@ target_link_libraries(freertos_config INTERFACE tfm-ns-interface app-config - fri-bsp ) diff --git a/bsp/isp_mali-c55/integration/CMakeLists.txt b/bsp/isp_mali-c55/integration/CMakeLists.txt index 3b7aa403..fdca38d5 100755 --- a/bsp/isp_mali-c55/integration/CMakeLists.txt +++ b/bsp/isp_mali-c55/integration/CMakeLists.txt @@ -38,7 +38,7 @@ add_library(isp_platform_driver_system) target_link_libraries(isp_platform_driver_system PUBLIC isp_driver - freertos_kernel_include + freertos_kernel ) target_include_directories(isp_platform_driver_system PUBLIC @@ -87,5 +87,5 @@ target_sources(isp_control target_link_libraries(isp_control isp_driver - freertos_kernel_include + freertos_kernel ) diff --git a/components/connectivity/freertos_plus_tcp/integration/CMakeLists.txt b/components/connectivity/freertos_plus_tcp/integration/CMakeLists.txt index 9fe36144..ce388b28 100644 --- a/components/connectivity/freertos_plus_tcp/integration/CMakeLists.txt +++ b/components/connectivity/freertos_plus_tcp/integration/CMakeLists.txt @@ -14,6 +14,12 @@ target_include_directories(freertos_plus_tcp SYSTEM ) target_link_libraries(freertos_plus_tcp + PUBLIC + # TODO: The CS315 network interface layer inside the FreeRTOS TCP/IP stack + # https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/source/portable/NetworkInterface/MPS4_CS315/Device/Include/SSE315.h#L62 + # is done in such a way that it depends on fri-bsp. This dependency + # should be removed. + fri-bsp PRIVATE coremqtt helpers-events diff --git a/components/freertos_kernel/CMakeLists.txt b/components/freertos_kernel/CMakeLists.txt index fd0839ee..4ea11c34 100644 --- a/components/freertos_kernel/CMakeLists.txt +++ b/components/freertos_kernel/CMakeLists.txt @@ -18,4 +18,10 @@ endif() # FreeRTOS requires the freertos_config library to exist first add_library(freertos_config INTERFACE) +target_include_directories(freertos_config + INTERFACE + $<$:${IOT_REFERENCE_ARM_CORSTONE3XX_SOURCE_DIR}/bsp/corstone300/include> + $<$:${IOT_REFERENCE_ARM_CORSTONE3XX_SOURCE_DIR}/bsp/corstone310/include> + $<$:${IOT_REFERENCE_ARM_CORSTONE3XX_SOURCE_DIR}/bsp/corstone315/include> +) add_subdirectory(library) diff --git a/components/freertos_kernel/library b/components/freertos_kernel/library index 02642802..dbf70559 160000 --- a/components/freertos_kernel/library +++ b/components/freertos_kernel/library @@ -1 +1 @@ -Subproject commit 0264280230aa6a828247b5f05bf57e33f1994581 +Subproject commit dbf70559b27d39c1fdb68dfb9a32140b6a6777a0 diff --git a/manifest.yml b/manifest.yml index 2039edd1..5a65ef60 100644 --- a/manifest.yml +++ b/manifest.yml @@ -5,7 +5,7 @@ description: |- dependencies: - name: "FreeRTOS-Kernel" license: "MIT" - version: "V10.6.1" + version: "V11.1.0" repository: type: "git" url: "https://github.com/FreeRTOS/FreeRTOS-Kernel.git" diff --git a/release_changes/202404301532.change b/release_changes/202404301532.change new file mode 100644 index 00000000..df1162a5 --- /dev/null +++ b/release_changes/202404301532.change @@ -0,0 +1 @@ +freertos-kernel: Update to `V11.1.0` release