From 11d96b39d0feafd8a77bdaf80110f021696d1867 Mon Sep 17 00:00:00 2001 From: Darian Leung Date: Mon, 27 Apr 2020 14:29:54 +0800 Subject: [PATCH] esp_ipc: Move to new component This commit moves esp_ipc into a separate component. --- components/bt/CMakeLists.txt | 4 +++- components/driver/CMakeLists.txt | 2 +- components/esp32/CMakeLists.txt | 2 +- components/esp32s2/cpu_start.c | 1 - components/esp_common/CMakeLists.txt | 8 ++------ components/esp_common/component.mk | 5 ----- components/esp_ipc/CMakeLists.txt | 2 ++ components/esp_ipc/component.mk | 3 +++ components/{esp_common => esp_ipc}/include/esp_ipc.h | 0 components/{esp_common/src => esp_ipc}/ipc.c | 0 components/esp_ipc/test/CMakeLists.txt | 6 ++++++ components/esp_ipc/test/component.mk | 1 + components/{esp32 => esp_ipc}/test/test_ipc.c | 8 +++++--- components/esp_timer/test/test_esp_timer.c | 1 - components/freertos/test/CMakeLists.txt | 2 +- components/freertos/test/test_freertos_mutex.c | 1 - components/freertos/test/test_freertos_task_notify.c | 2 ++ components/freertos/test/test_task_suspend_resume.c | 6 ++++-- components/spi_flash/CMakeLists.txt | 2 +- components/spi_flash/cache_utils.c | 2 ++ components/spi_flash/flash_mmap.c | 1 - components/spi_flash/flash_ops.c | 1 - docs/Doxyfile | 2 +- tools/unit-test-app/components/test_utils/CMakeLists.txt | 2 +- tools/unit-test-app/components/test_utils/ccomp_timer.c | 1 - .../components/test_utils/ccomp_timer_impl.c | 1 - .../components/test_utils/test/CMakeLists.txt | 2 +- .../components/test_utils/test/ccomp_timer_test_api.c | 2 ++ .../components/test_utils/test/ccomp_timer_test_data.c | 1 - tools/unit-test-app/configs/default | 2 +- tools/unit-test-app/configs/default_2 | 2 +- tools/unit-test-app/configs/default_2_s2 | 2 +- tools/unit-test-app/configs/freertos_compliance | 2 +- tools/unit-test-app/configs/psram | 2 +- tools/unit-test-app/configs/psram_2 | 2 +- tools/unit-test-app/configs/release | 2 +- tools/unit-test-app/configs/release_2 | 2 +- tools/unit-test-app/configs/release_2_s2 | 2 +- tools/unit-test-app/configs/single_core_2 | 2 +- tools/unit-test-app/configs/single_core_2_s2 | 2 +- 40 files changed, 50 insertions(+), 43 deletions(-) create mode 100644 components/esp_ipc/CMakeLists.txt create mode 100644 components/esp_ipc/component.mk rename components/{esp_common => esp_ipc}/include/esp_ipc.h (100%) rename components/{esp_common/src => esp_ipc}/ipc.c (100%) create mode 100644 components/esp_ipc/test/CMakeLists.txt create mode 100644 components/esp_ipc/test/component.mk rename components/{esp32 => esp_ipc}/test/test_ipc.c (97%) diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt index 9af9f10483..e9a2a0f4e8 100644 --- a/components/bt/CMakeLists.txt +++ b/components/bt/CMakeLists.txt @@ -539,13 +539,15 @@ if(CONFIG_BT_ENABLED) endif() endif() + endif() # requirements can't depend on config idf_component_register(SRCS "${srcs}" INCLUDE_DIRS "${include_dirs}" PRIV_INCLUDE_DIRS "${priv_include_dirs}" - REQUIRES nvs_flash soc esp_timer) + REQUIRES nvs_flash soc esp_timer + PRIV_REQUIRES esp_ipc) if(CONFIG_BT_ENABLED) target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-implicit-fallthrough -Wno-unused-const-variable) diff --git a/components/driver/CMakeLists.txt b/components/driver/CMakeLists.txt index 210073ed7f..cd72d418d4 100644 --- a/components/driver/CMakeLists.txt +++ b/components/driver/CMakeLists.txt @@ -48,7 +48,7 @@ endif() idf_component_register(SRCS "${srcs}" INCLUDE_DIRS ${includes} PRIV_INCLUDE_DIRS "include/driver" - PRIV_REQUIRES efuse esp_timer + PRIV_REQUIRES efuse esp_timer esp_ipc REQUIRES esp_ringbuf freertos soc) #cannot totally hide soc headers, since there are a lot arguments in the driver are chip-dependent # uses C11 atomic feature diff --git a/components/esp32/CMakeLists.txt b/components/esp32/CMakeLists.txt index ecc765ba78..f94fd806ff 100644 --- a/components/esp32/CMakeLists.txt +++ b/components/esp32/CMakeLists.txt @@ -36,7 +36,7 @@ else() # app_update is added here because cpu_start.c uses esp_ota_get_app_description() function. # esp_timer is added here because cpu_start.c uses esp_timer set(priv_requires app_trace app_update bootloader_support log mbedtls nvs_flash pthread - spi_flash vfs espcoredump esp_common perfmon esp_timer) + spi_flash vfs espcoredump esp_common perfmon esp_timer esp_ipc) set(fragments linker.lf ld/esp32_fragments.lf) idf_component_register(SRCS "${srcs}" diff --git a/components/esp32s2/cpu_start.c b/components/esp32s2/cpu_start.c index db85aa3ef3..2b9488e35b 100644 --- a/components/esp32s2/cpu_start.c +++ b/components/esp32s2/cpu_start.c @@ -50,7 +50,6 @@ #include "nvs_flash.h" #include "esp_event.h" #include "esp_spi_flash.h" -#include "esp_ipc.h" #include "esp_private/crosscore_int.h" #include "esp_log.h" #include "esp_vfs_dev.h" diff --git a/components/esp_common/CMakeLists.txt b/components/esp_common/CMakeLists.txt index c0d16dc737..4fad92dfeb 100644 --- a/components/esp_common/CMakeLists.txt +++ b/components/esp_common/CMakeLists.txt @@ -17,14 +17,10 @@ else() "src/task_wdt.c" "src/int_wdt.c") - # IPC framework is not applicable if freertos unicore config is selected - if(NOT CONFIG_FREERTOS_UNICORE) - list(APPEND srcs "src/ipc.c") - endif() - + # Note: esp_ipc added as a public requirement to keep compatibility as to be located here. idf_component_register(SRCS "${srcs}" INCLUDE_DIRS include - REQUIRES ${target} espcoredump esp_timer + REQUIRES ${target} espcoredump esp_timer esp_ipc PRIV_REQUIRES soc LDFRAGMENTS "linker.lf") diff --git a/components/esp_common/component.mk b/components/esp_common/component.mk index 4d80bc4bf6..64c67abcc5 100644 --- a/components/esp_common/component.mk +++ b/components/esp_common/component.mk @@ -5,10 +5,5 @@ COMPONENT_ADD_INCLUDEDIRS := include COMPONENT_SRCDIRS := src -# IPC framework is not applicable if freertos unicore config is selected -ifdef CONFIG_FREERTOS_UNICORE -COMPONENT_OBJEXCLUDE := src/ipc.o -endif - # disable stack protection in files which are involved in initialization of that feature src/stack_check.o: CFLAGS := $(filter-out -fstack-protector%, $(CFLAGS)) diff --git a/components/esp_ipc/CMakeLists.txt b/components/esp_ipc/CMakeLists.txt new file mode 100644 index 0000000000..7679665204 --- /dev/null +++ b/components/esp_ipc/CMakeLists.txt @@ -0,0 +1,2 @@ +idf_component_register(SRCS "ipc.c" + INCLUDE_DIRS "include") \ No newline at end of file diff --git a/components/esp_ipc/component.mk b/components/esp_ipc/component.mk new file mode 100644 index 0000000000..7decee1a04 --- /dev/null +++ b/components/esp_ipc/component.mk @@ -0,0 +1,3 @@ +# +# Component Makefile +# \ No newline at end of file diff --git a/components/esp_common/include/esp_ipc.h b/components/esp_ipc/include/esp_ipc.h similarity index 100% rename from components/esp_common/include/esp_ipc.h rename to components/esp_ipc/include/esp_ipc.h diff --git a/components/esp_common/src/ipc.c b/components/esp_ipc/ipc.c similarity index 100% rename from components/esp_common/src/ipc.c rename to components/esp_ipc/ipc.c diff --git a/components/esp_ipc/test/CMakeLists.txt b/components/esp_ipc/test/CMakeLists.txt new file mode 100644 index 0000000000..1e6b4c8b07 --- /dev/null +++ b/components/esp_ipc/test/CMakeLists.txt @@ -0,0 +1,6 @@ +if(IDF_TARGET STREQUAL "esp32") + idf_component_register(SRC_DIRS "." + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity test_utils) +endif() + diff --git a/components/esp_ipc/test/component.mk b/components/esp_ipc/test/component.mk new file mode 100644 index 0000000000..53c8f3a5b2 --- /dev/null +++ b/components/esp_ipc/test/component.mk @@ -0,0 +1 @@ +COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive \ No newline at end of file diff --git a/components/esp32/test/test_ipc.c b/components/esp_ipc/test/test_ipc.c similarity index 97% rename from components/esp32/test/test_ipc.c rename to components/esp_ipc/test/test_ipc.c index 1494f1c298..c01acbaa42 100644 --- a/components/esp32/test/test_ipc.c +++ b/components/esp_ipc/test/test_ipc.c @@ -1,11 +1,13 @@ #include +#include "sdkconfig.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "freertos/semphr.h" #include "unity.h" +#if !CONFIG_FREERTOS_UNICORE #include "esp_ipc.h" +#endif #include "esp_log.h" -#include "sdkconfig.h" #if !CONFIG_FREERTOS_UNICORE static void test_func_ipc_cb(void *arg) @@ -120,6 +122,6 @@ TEST_CASE("Test multiple ipc_calls", "[ipc]") } } } -#endif /* !CONFIG_FREERTOS_UNICORE */ +#endif /* CONFIG_ESP_IPC_USE_CALLERS_PRIORITY */ -#endif // CONFIG_ESP_IPC_USE_CALLERS_PRIORITY +#endif /* !CONFIG_FREERTOS_UNICORE */ diff --git a/components/esp_timer/test/test_esp_timer.c b/components/esp_timer/test/test_esp_timer.c index 839b68a29b..c8972ed60a 100644 --- a/components/esp_timer/test/test_esp_timer.c +++ b/components/esp_timer/test/test_esp_timer.c @@ -704,7 +704,6 @@ TEST_CASE("Can start/stop timer from ISR context", "[esp_timer]") #include "soc/dport_reg.h" #include "soc/frc_timer_reg.h" -#include "esp_ipc.h" static bool task_stop; static bool time_jumped; diff --git a/components/freertos/test/CMakeLists.txt b/components/freertos/test/CMakeLists.txt index 8b3fd3809a..72b61327d3 100644 --- a/components/freertos/test/CMakeLists.txt +++ b/components/freertos/test/CMakeLists.txt @@ -1,4 +1,4 @@ idf_component_register(SRC_DIRS . PRIV_INCLUDE_DIRS . - PRIV_REQUIRES unity test_utils + PRIV_REQUIRES unity test_utils esp_ipc ) \ No newline at end of file diff --git a/components/freertos/test/test_freertos_mutex.c b/components/freertos/test/test_freertos_mutex.c index 51697984e7..4b24834d3d 100644 --- a/components/freertos/test/test_freertos_mutex.c +++ b/components/freertos/test/test_freertos_mutex.c @@ -2,7 +2,6 @@ #include "freertos/task.h" #include "freertos/semphr.h" #include "unity.h" -#include "esp_ipc.h" #include "test_utils.h" static void mutex_release_task(void* arg) diff --git a/components/freertos/test/test_freertos_task_notify.c b/components/freertos/test/test_freertos_task_notify.c index c7961fe3b8..d78d2b9b18 100644 --- a/components/freertos/test/test_freertos_task_notify.c +++ b/components/freertos/test/test_freertos_task_notify.c @@ -11,7 +11,9 @@ #include "freertos/task.h" #include #include "driver/timer.h" +#ifndef CONFIG_FREERTOS_UNICORE #include "esp_ipc.h" +#endif #include "unity.h" #include "test_utils.h" diff --git a/components/freertos/test/test_task_suspend_resume.c b/components/freertos/test/test_task_suspend_resume.c index ec8eb9e91b..adbeb19133 100644 --- a/components/freertos/test/test_task_suspend_resume.c +++ b/components/freertos/test/test_task_suspend_resume.c @@ -1,7 +1,7 @@ /* Tests for FreeRTOS task suspend & resume */ #include #include - +#include "sdkconfig.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "freertos/semphr.h" @@ -14,9 +14,11 @@ #include "driver/timer.h" +#ifndef CONFIG_FREERTOS_UNICORE #include "esp_ipc.h" +#endif #include "esp_freertos_hooks.h" -#include "sdkconfig.h" + #ifdef CONFIG_IDF_TARGET_ESP32S2 #define int_clr_timers int_clr diff --git a/components/spi_flash/CMakeLists.txt b/components/spi_flash/CMakeLists.txt index b646ffaa97..2e2d6e6a4b 100644 --- a/components/spi_flash/CMakeLists.txt +++ b/components/spi_flash/CMakeLists.txt @@ -41,7 +41,7 @@ else() "spi_flash_os_func_noos.c") list(APPEND srcs ${cache_srcs}) - set(priv_requires bootloader_support app_update soc) + set(priv_requires bootloader_support app_update soc esp_ipc) endif() idf_component_register(SRCS "${srcs}" diff --git a/components/spi_flash/cache_utils.c b/components/spi_flash/cache_utils.c index 495a748bee..1d8a3fb570 100644 --- a/components/spi_flash/cache_utils.c +++ b/components/spi_flash/cache_utils.c @@ -32,7 +32,9 @@ #include #include #include "sdkconfig.h" +#ifndef CONFIG_FREERTOS_UNICORE #include "esp_ipc.h" +#endif #include "esp_attr.h" #include "esp_intr_alloc.h" #include "esp_spi_flash.h" diff --git a/components/spi_flash/flash_mmap.c b/components/spi_flash/flash_mmap.c index f64a912b97..54055d7747 100644 --- a/components/spi_flash/flash_mmap.c +++ b/components/spi_flash/flash_mmap.c @@ -24,7 +24,6 @@ #include #include #include "sdkconfig.h" -#include "esp_ipc.h" #include "esp_attr.h" #include "esp_spi_flash.h" #include "esp_flash_encrypt.h" diff --git a/components/spi_flash/flash_ops.c b/components/spi_flash/flash_ops.c index 81fa35fce6..a561cb4b5e 100644 --- a/components/spi_flash/flash_ops.c +++ b/components/spi_flash/flash_ops.c @@ -25,7 +25,6 @@ #include #include #include "sdkconfig.h" -#include "esp_ipc.h" #include "esp_attr.h" #include "esp_spi_flash.h" #include "esp_log.h" diff --git a/docs/Doxyfile b/docs/Doxyfile index 331b966587..1c9a0f34e0 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -232,7 +232,7 @@ INPUT = \ ## Hooks $(IDF_PATH)/components/esp_common/include/esp_freertos_hooks.h \ ## Inter-Processor Call - $(IDF_PATH)/components/esp_common/include/esp_ipc.h \ + $(IDF_PATH)/components/esp_ipc/include/esp_ipc.h \ ## Call Function with External stack $(IDF_PATH)/components/esp_common/include/esp_expression_with_stack.h \ ## Over The Air Updates (OTA) diff --git a/tools/unit-test-app/components/test_utils/CMakeLists.txt b/tools/unit-test-app/components/test_utils/CMakeLists.txt index d87ef0a42b..5e7583e5d3 100644 --- a/tools/unit-test-app/components/test_utils/CMakeLists.txt +++ b/tools/unit-test-app/components/test_utils/CMakeLists.txt @@ -6,6 +6,6 @@ idf_component_register(SRCS "ccomp_timer.c" INCLUDE_DIRS include PRIV_INCLUDE_DIRS private_include REQUIRES spi_flash idf_test unity - PRIV_REQUIRES perfmon) + PRIV_REQUIRES perfmon esp_ipc) diff --git a/tools/unit-test-app/components/test_utils/ccomp_timer.c b/tools/unit-test-app/components/test_utils/ccomp_timer.c index cb60569aad..c218b22f65 100644 --- a/tools/unit-test-app/components/test_utils/ccomp_timer.c +++ b/tools/unit-test-app/components/test_utils/ccomp_timer.c @@ -21,7 +21,6 @@ #include "freertos/semphr.h" #include "esp_log.h" -#include "esp_ipc.h" #include "esp_intr_alloc.h" #if CONFIG_IDF_TARGET_ESP32 diff --git a/tools/unit-test-app/components/test_utils/ccomp_timer_impl.c b/tools/unit-test-app/components/test_utils/ccomp_timer_impl.c index 9fb0098c71..2caddf2481 100644 --- a/tools/unit-test-app/components/test_utils/ccomp_timer_impl.c +++ b/tools/unit-test-app/components/test_utils/ccomp_timer_impl.c @@ -26,7 +26,6 @@ #include "xtensa/core-macros.h" #include "xtensa/xt_perf_consts.h" #include "xtensa-debug-module.h" -#include "esp_ipc.h" #if CONFIG_IDF_TARGET_ESP32 #include "esp32/clk.h" diff --git a/tools/unit-test-app/components/test_utils/test/CMakeLists.txt b/tools/unit-test-app/components/test_utils/test/CMakeLists.txt index 1ad7802a8a..46f813b166 100644 --- a/tools/unit-test-app/components/test_utils/test/CMakeLists.txt +++ b/tools/unit-test-app/components/test_utils/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS "." PRIV_INCLUDE_DIRS "." - PRIV_REQUIRES unity test_utils perfmon) + PRIV_REQUIRES unity test_utils perfmon esp_ipc) diff --git a/tools/unit-test-app/components/test_utils/test/ccomp_timer_test_api.c b/tools/unit-test-app/components/test_utils/test/ccomp_timer_test_api.c index 08f950dd0d..afb51e0449 100644 --- a/tools/unit-test-app/components/test_utils/test/ccomp_timer_test_api.c +++ b/tools/unit-test-app/components/test_utils/test/ccomp_timer_test_api.c @@ -9,7 +9,9 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" +#ifndef CONFIG_FREERTOS_UNICORE #include "esp_ipc.h" +#endif #include "unity.h" diff --git a/tools/unit-test-app/components/test_utils/test/ccomp_timer_test_data.c b/tools/unit-test-app/components/test_utils/test/ccomp_timer_test_data.c index 61c8e9100b..e1f620fabc 100644 --- a/tools/unit-test-app/components/test_utils/test/ccomp_timer_test_data.c +++ b/tools/unit-test-app/components/test_utils/test/ccomp_timer_test_data.c @@ -8,7 +8,6 @@ #include "eri.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" -#include "esp_ipc.h" #if CONFIG_IDF_TARGET_ESP32 diff --git a/tools/unit-test-app/configs/default b/tools/unit-test-app/configs/default index 5a1be7c8ec..390400d277 100644 --- a/tools/unit-test-app/configs/default +++ b/tools/unit-test-app/configs/default @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=freertos esp32 esp_timer driver heap pthread soc spi_flash vfs \ No newline at end of file +TEST_COMPONENTS=freertos esp32 esp_ipc esp_timer driver heap pthread soc spi_flash vfs \ No newline at end of file diff --git a/tools/unit-test-app/configs/default_2 b/tools/unit-test-app/configs/default_2 index 61d589d800..83423506bd 100644 --- a/tools/unit-test-app/configs/default_2 +++ b/tools/unit-test-app/configs/default_2 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32" -TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 esp_timer driver heap pthread soc spi_flash vfs test_utils +TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 esp_ipc esp_timer driver heap pthread soc spi_flash vfs test_utils diff --git a/tools/unit-test-app/configs/default_2_s2 b/tools/unit-test-app/configs/default_2_s2 index b091ce9190..0783940176 100644 --- a/tools/unit-test-app/configs/default_2_s2 +++ b/tools/unit-test-app/configs/default_2_s2 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s2" -TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32s2 esp_timer driver heap pthread soc spi_flash vfs +TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32s2 esp_ipc esp_timer driver heap pthread soc spi_flash vfs diff --git a/tools/unit-test-app/configs/freertos_compliance b/tools/unit-test-app/configs/freertos_compliance index 904701d97b..cd15c21119 100644 --- a/tools/unit-test-app/configs/freertos_compliance +++ b/tools/unit-test-app/configs/freertos_compliance @@ -1,4 +1,4 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=driver esp32 esp_timer spi_flash +TEST_COMPONENTS=driver esp32 esp_ipc esp_timer spi_flash CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE=y diff --git a/tools/unit-test-app/configs/psram b/tools/unit-test-app/configs/psram index ec84981004..86efe9afab 100644 --- a/tools/unit-test-app/configs/psram +++ b/tools/unit-test-app/configs/psram @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32" -TEST_EXCLUDE_COMPONENTS=libsodium bt app_update driver esp32 esp_timer mbedtls spi_flash test_utils heap pthread soc +TEST_EXCLUDE_COMPONENTS=libsodium bt app_update driver esp32 esp_ipc esp_timer mbedtls spi_flash test_utils heap pthread soc CONFIG_ESP32_SPIRAM_SUPPORT=y CONFIG_ESP_INT_WDT_TIMEOUT_MS=800 CONFIG_SPIRAM_OCCUPY_NO_HOST=y diff --git a/tools/unit-test-app/configs/psram_2 b/tools/unit-test-app/configs/psram_2 index 174744cf76..7f5c3460ab 100644 --- a/tools/unit-test-app/configs/psram_2 +++ b/tools/unit-test-app/configs/psram_2 @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=esp32 esp_timer mbedtls spi_flash heap pthread soc +TEST_COMPONENTS=esp32 esp_ipc esp_timer mbedtls spi_flash heap pthread soc CONFIG_ESP32_SPIRAM_SUPPORT=y CONFIG_ESP_INT_WDT_TIMEOUT_MS=800 CONFIG_SPIRAM_OCCUPY_NO_HOST=y diff --git a/tools/unit-test-app/configs/release b/tools/unit-test-app/configs/release index f4c743fcfe..40d835983f 100644 --- a/tools/unit-test-app/configs/release +++ b/tools/unit-test-app/configs/release @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=freertos esp32 esp_timer driver heap pthread soc spi_flash vfs +TEST_COMPONENTS=freertos esp32 esp_ipc esp_timer driver heap pthread soc spi_flash vfs CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y diff --git a/tools/unit-test-app/configs/release_2 b/tools/unit-test-app/configs/release_2 index ca84fa7721..9d116fd570 100644 --- a/tools/unit-test-app/configs/release_2 +++ b/tools/unit-test-app/configs/release_2 @@ -1,6 +1,6 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) CONFIG_IDF_TARGET="esp32" -TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 esp_timer driver heap pthread soc spi_flash vfs test_utils +TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 esp_ipc esp_timer driver heap pthread soc spi_flash vfs test_utils CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y diff --git a/tools/unit-test-app/configs/release_2_s2 b/tools/unit-test-app/configs/release_2_s2 index 6ebab9229c..6ab1b2375e 100644 --- a/tools/unit-test-app/configs/release_2_s2 +++ b/tools/unit-test-app/configs/release_2_s2 @@ -1,6 +1,6 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s2" -TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32s2 esp_timer driver heap pthread soc spi_flash vfs test_utils +TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32s2 esp_ipc esp_timer driver heap pthread soc spi_flash vfs test_utils CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y diff --git a/tools/unit-test-app/configs/single_core_2 b/tools/unit-test-app/configs/single_core_2 index 13cf210d42..366fb0d4cc 100644 --- a/tools/unit-test-app/configs/single_core_2 +++ b/tools/unit-test-app/configs/single_core_2 @@ -1,6 +1,6 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32" -TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 esp_timer driver heap pthread soc spi_flash vfs test_utils +TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 esp_ipc esp_timer driver heap pthread soc spi_flash vfs test_utils CONFIG_MEMMAP_SMP=n CONFIG_FREERTOS_UNICORE=y CONFIG_ESP32_RTCDATA_IN_FAST_MEM=y diff --git a/tools/unit-test-app/configs/single_core_2_s2 b/tools/unit-test-app/configs/single_core_2_s2 index bb52032af3..5492314d51 100644 --- a/tools/unit-test-app/configs/single_core_2_s2 +++ b/tools/unit-test-app/configs/single_core_2_s2 @@ -1,6 +1,6 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s2" -TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32s2 esp_timer driver heap pthread soc spi_flash vfs +TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32s2 esp_ipc esp_timer driver heap pthread soc spi_flash vfs CONFIG_MEMMAP_SMP=n CONFIG_FREERTOS_UNICORE=y CONFIG_ESP32_RTCDATA_IN_FAST_MEM=y