From 46c3d4d07be1ec555936ca6b0249af96322927f1 Mon Sep 17 00:00:00 2001 From: YuanMingFu Date: Fri, 12 Apr 2024 17:07:27 +0800 Subject: [PATCH] relinker: add support for more idf version --- .../cmake_common/components_include.cmake | 29 +++ .../{esp32c2 => esp32c2_v5.1}/function.csv | 0 .../{esp32c2 => esp32c2_v5.1}/library.csv | 0 .../{esp32c2 => esp32c2_v5.1}/object.csv | 0 .../common/relinker/esp32c2_v5.2/function.csv | 229 ++++++++++++++++++ .../common/relinker/esp32c2_v5.2/library.csv | 23 ++ .../common/relinker/esp32c2_v5.2/object.csv | 67 +++++ examples/generic_switch/CMakeLists.txt | 1 + .../generic_switch/sdkconfig.defaults.esp32c2 | 5 - .../sdkconfig.defaults.esp32c2.v5.1 | 4 + .../sdkconfig.defaults.esp32c2.v5.2 | 4 + examples/light/CMakeLists.txt | 1 + examples/light/sdkconfig.defaults.esp32c2 | 5 - .../light/sdkconfig.defaults.esp32c2.v5.1 | 4 + .../light/sdkconfig.defaults.esp32c2.v5.2 | 4 + examples/light_switch/CMakeLists.txt | 1 + .../light_switch/sdkconfig.defaults.esp32c2 | 5 - .../sdkconfig.defaults.esp32c2.v5.1 | 4 + .../sdkconfig.defaults.esp32c2.v5.2 | 4 + examples/refrigerator/CMakeLists.txt | 1 + .../sdkconfig.defaults.esp32c2.v5.1 | 4 + .../sdkconfig.defaults.esp32c2.v5.2 | 4 + examples/room_air_conditioner/CMakeLists.txt | 1 + .../sdkconfig.defaults.esp32c2 | 5 - .../sdkconfig.defaults.esp32c2.v5.1 | 4 + .../sdkconfig.defaults.esp32c2.v5.2 | 4 + examples/zap_light/CMakeLists.txt | 1 + examples/zap_light/sdkconfig.defaults.esp32c2 | 5 - .../zap_light/sdkconfig.defaults.esp32c2.v5.1 | 4 + .../zap_light/sdkconfig.defaults.esp32c2.v5.2 | 4 + 30 files changed, 402 insertions(+), 25 deletions(-) create mode 100644 examples/common/cmake_common/components_include.cmake rename examples/common/relinker/{esp32c2 => esp32c2_v5.1}/function.csv (100%) rename examples/common/relinker/{esp32c2 => esp32c2_v5.1}/library.csv (100%) rename examples/common/relinker/{esp32c2 => esp32c2_v5.1}/object.csv (100%) create mode 100644 examples/common/relinker/esp32c2_v5.2/function.csv create mode 100644 examples/common/relinker/esp32c2_v5.2/library.csv create mode 100644 examples/common/relinker/esp32c2_v5.2/object.csv create mode 100644 examples/generic_switch/sdkconfig.defaults.esp32c2.v5.1 create mode 100644 examples/generic_switch/sdkconfig.defaults.esp32c2.v5.2 create mode 100644 examples/light/sdkconfig.defaults.esp32c2.v5.1 create mode 100644 examples/light/sdkconfig.defaults.esp32c2.v5.2 create mode 100644 examples/light_switch/sdkconfig.defaults.esp32c2.v5.1 create mode 100644 examples/light_switch/sdkconfig.defaults.esp32c2.v5.2 create mode 100644 examples/refrigerator/sdkconfig.defaults.esp32c2.v5.1 create mode 100644 examples/refrigerator/sdkconfig.defaults.esp32c2.v5.2 create mode 100644 examples/room_air_conditioner/sdkconfig.defaults.esp32c2.v5.1 create mode 100644 examples/room_air_conditioner/sdkconfig.defaults.esp32c2.v5.2 create mode 100644 examples/zap_light/sdkconfig.defaults.esp32c2.v5.1 create mode 100644 examples/zap_light/sdkconfig.defaults.esp32c2.v5.2 diff --git a/examples/common/cmake_common/components_include.cmake b/examples/common/cmake_common/components_include.cmake new file mode 100644 index 000000000..88916c9bc --- /dev/null +++ b/examples/common/cmake_common/components_include.cmake @@ -0,0 +1,29 @@ +cmake_minimum_required(VERSION 3.5) + +message(IDF_VERSION ": $ENV{IDF_VERSION}; idf version number: ${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}") +get_filename_component(SDKCONFIG_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sdkconfig.defaults" ABSOLUTE) +set(SDKCONFIG_FILES "${SDKCONFIG_COMMON_DIR}") + +# checking if sdkconfig.defaults.target_device exists +get_filename_component(SDKCONFIG_TARGET "${SDKCONFIG_COMMON_DIR}.${IDF_TARGET}" ABSOLUTE) +if(EXISTS ${SDKCONFIG_TARGET}) + list(APPEND SDKCONFIG_FILES "${SDKCONFIG_TARGET}") +endif() + +# checking if IDF_TARGET is esp32c2 +if(IDF_TARGET STREQUAL "esp32c2") + # checking if sdkconfig.defaults.esp32c2.idf_ver exists + get_filename_component(SDKCONFIG_ESP32C2_IDF_MINVER "${SDKCONFIG_TARGET}.v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" ABSOLUTE) + get_filename_component(SDKCONFIG_ESP32C2_IDF_PATVER "${SDKCONFIG_TARGET}.v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}" ABSOLUTE) + if(EXISTS ${SDKCONFIG_ESP32C2_IDF_MINVER}) + list(APPEND SDKCONFIG_FILES "${SDKCONFIG_ESP32C2_IDF_MINVER}") + elseif(EXISTS ${SDKCONFIG_ESP32C2_IDF_PATVER}) + list(APPEND SDKCONFIG_FILES "${SDKCONFIG_ESP32C2_IDF_PATVER}") + else() + message(FATAL_ERROR "Can't support ESP32-C2 for this idf version v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}") + endif() +endif() + +# setting the final sdkconfig path +message(SDKCONFIG_PATH ": ${SDKCONFIG_FILES}") +set(SDKCONFIG_DEFAULTS ${SDKCONFIG_FILES}) diff --git a/examples/common/relinker/esp32c2/function.csv b/examples/common/relinker/esp32c2_v5.1/function.csv similarity index 100% rename from examples/common/relinker/esp32c2/function.csv rename to examples/common/relinker/esp32c2_v5.1/function.csv diff --git a/examples/common/relinker/esp32c2/library.csv b/examples/common/relinker/esp32c2_v5.1/library.csv similarity index 100% rename from examples/common/relinker/esp32c2/library.csv rename to examples/common/relinker/esp32c2_v5.1/library.csv diff --git a/examples/common/relinker/esp32c2/object.csv b/examples/common/relinker/esp32c2_v5.1/object.csv similarity index 100% rename from examples/common/relinker/esp32c2/object.csv rename to examples/common/relinker/esp32c2_v5.1/object.csv diff --git a/examples/common/relinker/esp32c2_v5.2/function.csv b/examples/common/relinker/esp32c2_v5.2/function.csv new file mode 100644 index 000000000..600f3ff50 --- /dev/null +++ b/examples/common/relinker/esp32c2_v5.2/function.csv @@ -0,0 +1,229 @@ +library,object,function,option +libbootloader_support.a,bootloader_flash.c.obj,bootloader_read_flash_id, +libbootloader_support.a,flash_encrypt.c.obj,esp_flash_encryption_enabled, +libdriver.a,gpio.c.obj,gpio_intr_service, +libesp_app_format.a,esp_app_desc.c.obj,esp_app_get_elf_sha256, +libesp_hw_support.a,cpu.c.obj,esp_cpu_wait_for_intr, +libesp_hw_support.a,cpu.c.obj,esp_cpu_reset, +libesp_hw_support.a,esp_clk.c.obj,esp_clk_cpu_freq, +libesp_hw_support.a,esp_clk.c.obj,esp_clk_apb_freq, +libesp_hw_support.a,esp_clk.c.obj,esp_clk_xtal_freq, +libesp_hw_support.a,esp_memory_utils.c.obj,esp_ptr_byte_accessible, +libesp_hw_support.a,hw_random.c.obj,esp_random, +libesp_hw_support.a,intr_alloc.c.obj,shared_intr_isr, +libesp_hw_support.a,intr_alloc.c.obj,esp_intr_noniram_disable, +libesp_hw_support.a,intr_alloc.c.obj,esp_intr_noniram_enable, +libesp_hw_support.a,intr_alloc.c.obj,esp_intr_enable, +libesp_hw_support.a,intr_alloc.c.obj,esp_intr_disable, +libesp_hw_support.a,periph_ctrl.c.obj,wifi_bt_common_module_enable, +libesp_hw_support.a,periph_ctrl.c.obj,wifi_bt_common_module_disable, +libesp_hw_support.a,regi2c_ctrl.c.obj,regi2c_ctrl_read_reg, +libesp_hw_support.a,regi2c_ctrl.c.obj,regi2c_ctrl_read_reg_mask, +libesp_hw_support.a,regi2c_ctrl.c.obj,regi2c_ctrl_write_reg, +libesp_hw_support.a,regi2c_ctrl.c.obj,regi2c_ctrl_write_reg_mask, +libesp_hw_support.a,regi2c_ctrl.c.obj,regi2c_enter_critical, +libesp_hw_support.a,regi2c_ctrl.c.obj,regi2c_exit_critical, +libesp_hw_support.a,regi2c_ctrl.c.obj,regi2c_analog_cali_reg_read, +libesp_hw_support.a,regi2c_ctrl.c.obj,regi2c_analog_cali_reg_write, +libesp_hw_support.a,rtc_clk.c.obj,rtc_clk_32k_enable_external, +libesp_hw_support.a,rtc_clk.c.obj,rtc_clk_fast_src_set, +libesp_hw_support.a,rtc_clk.c.obj,rtc_clk_slow_freq_get_hz, +libesp_hw_support.a,rtc_clk.c.obj,rtc_clk_slow_src_get, +libesp_hw_support.a,rtc_clk.c.obj,rtc_clk_slow_src_set, +libesp_hw_support.a,rtc_clk.c.obj,rtc_dig_clk8m_disable, +libesp_hw_support.a,rtc_clk.c.obj,rtc_clk_cpu_freq_set_config_fast, +libesp_hw_support.a,rtc_clk.c.obj,rtc_clk_8m_enable, +libesp_hw_support.a,rtc_clk.c.obj,rtc_clk_8md256_enabled, +libesp_hw_support.a,rtc_clk.c.obj,rtc_clk_cpu_freq_get_config, +libesp_hw_support.a,rtc_clk.c.obj,rtc_clk_cpu_freq_mhz_to_config, +libesp_hw_support.a,rtc_clk.c.obj,rtc_clk_cpu_freq_set_config, +libesp_hw_support.a,rtc_clk.c.obj,rtc_clk_cpu_freq_to_pll_mhz, +libesp_hw_support.a,rtc_clk.c.obj,rtc_clk_cpu_freq_set_xtal, +libesp_hw_support.a,rtc_clk.c.obj,rtc_clk_xtal_freq_get, +libesp_hw_support.a,rtc_clk.c.obj,rtc_clk_cpu_freq_to_xtal, +libesp_hw_support.a,rtc_clk.c.obj,rtc_clk_bbpll_disable, +libesp_hw_support.a,rtc_clk.c.obj,rtc_clk_apb_freq_update, +libesp_hw_support.a,rtc_clk.c.obj,clk_ll_rtc_slow_get_src,FALSE +libesp_hw_support.a,rtc_init.c.obj,rtc_vddsdio_set_config, +libesp_hw_support.a,rtc_module.c.obj,rtc_isr, +libesp_hw_support.a,rtc_module.c.obj,rtc_isr_noniram_disable, +libesp_hw_support.a,rtc_module.c.obj,rtc_isr_noniram_enable, +libesp_hw_support.a,rtc_sleep.c.obj,rtc_sleep_pu, +libesp_hw_support.a,rtc_sleep.c.obj,rtc_sleep_get_default_config, +libesp_hw_support.a,rtc_sleep.c.obj,rtc_sleep_init, +libesp_hw_support.a,rtc_sleep.c.obj,rtc_sleep_low_init, +libesp_hw_support.a,rtc_sleep.c.obj,rtc_sleep_start, +libesp_hw_support.a,rtc_time.c.obj,rtc_clk_cal, +libesp_hw_support.a,rtc_time.c.obj,rtc_clk_cal_internal, +libesp_hw_support.a,rtc_time.c.obj,rtc_time_get, +libesp_hw_support.a,rtc_time.c.obj,rtc_time_us_to_slowclk, +libesp_hw_support.a,rtc_time.c.obj,rtc_time_slowclk_to_us, +libesp_hw_support.a,sleep_modes.c.obj,periph_ll_periph_enabled, +libesp_hw_support.a,sleep_modes.c.obj,esp_sleep_start, +libesp_hw_support.a,sleep_modes.c.obj,esp_deep_sleep_start, +libesp_hw_support.a,systimer.c.obj,systimer_us_to_ticks, +libesp_phy.a,phy_init.c.obj,esp_phy_common_clock_enable, +libesp_phy.a,phy_init.c.obj,esp_phy_common_clock_disable, +libesp_phy.a,phy_init.c.obj,esp_wifi_bt_power_domain_on, +libesp_phy.a,phy_override.c.obj,phy_i2c_enter_critical, +libesp_phy.a,phy_override.c.obj,phy_i2c_exit_critical, +libesp_pm.a,pm_locks.c.obj,esp_pm_lock_acquire, +libesp_pm.a,pm_locks.c.obj,esp_pm_lock_release, +libesp_pm.a,pm_impl.c.obj,esp_pm_impl_switch_mode, +libesp_pm.a,pm_impl.c.obj,vApplicationSleep,CONFIG_FREERTOS_USE_TICKLESS_IDLE +libesp_ringbuf.a,ringbuf.c.obj,prvCheckItemAvail, +libesp_ringbuf.a,ringbuf.c.obj,prvGetFreeSize, +libesp_ringbuf.a,ringbuf.c.obj,prvReceiveGenericFromISR, +libesp_ringbuf.a,ringbuf.c.obj,xRingbufferGetMaxItemSize, +libesp_rom.a,esp_rom_systimer.c.obj,systimer_hal_init, +libesp_rom.a,esp_rom_systimer.c.obj,systimer_hal_set_alarm_period, +libesp_rom.a,esp_rom_systimer.c.obj,systimer_hal_set_alarm_target, +libesp_rom.a,esp_rom_systimer.c.obj,systimer_hal_set_tick_rate_ops, +libesp_rom.a,esp_rom_uart.c.obj,esp_rom_uart_set_clock_baudrate, +libesp_system.a,brownout.c.obj,rtc_brownout_isr_handler,CONFIG_ESP_SYSTEM_BROWNOUT_INTR +libesp_system.a,cache_err_int.c.obj,esp_cache_err_get_cpuid, +libesp_system.a,cpu_start.c.obj,call_start_cpu0, +libesp_system.a,crosscore_int.c.obj,esp_crosscore_int_send, +libesp_system.a,crosscore_int.c.obj,esp_crosscore_int_send_yield, +libesp_system.a,esp_system.c.obj,esp_restart, +libesp_system.a,esp_system.c.obj,esp_system_abort, +libesp_system.a,reset_reason.c.obj,esp_reset_reason_set_hint, +libesp_system.a,reset_reason.c.obj,esp_reset_reason_get_hint, +libesp_system.a,ubsan.c.obj,__ubsan_include, +libesp_timer.a,esp_timer.c.obj,esp_timer_get_next_alarm_for_wake_up, +libesp_timer.a,esp_timer.c.obj,esp_timer_start_once, +libesp_timer.a,esp_timer.c.obj,esp_timer_start_periodic, +libesp_timer.a,esp_timer.c.obj,esp_timer_stop, +libesp_timer.a,esp_timer.c.obj,esp_timer_get_expiry_time, +libesp_timer.a,esp_timer_impl_systimer.c.obj,esp_timer_impl_set_alarm_id, +libesp_timer.a,esp_timer_impl_systimer.c.obj,esp_timer_impl_update_apb_freq, +libesp_timer.a,esp_timer_impl_systimer.c.obj,esp_timer_impl_get_min_period_us, +libesp_timer.a,ets_timer_legacy.c.obj,ets_timer_arm_us, +libesp_timer.a,ets_timer_legacy.c.obj,ets_timer_arm, +libesp_timer.a,ets_timer_legacy.c.obj,ets_timer_disarm, +libesp_timer.a,system_time.c.obj,esp_system_get_time, +libesp_wifi.a,esp_adapter.c.obj,semphr_take_from_isr_wrapper, +libesp_wifi.a,esp_adapter.c.obj,wifi_realloc, +libesp_wifi.a,esp_adapter.c.obj,coex_event_duration_get_wrapper, +libesp_wifi.a,esp_adapter.c.obj,coex_schm_interval_set_wrapper, +libesp_wifi.a,esp_adapter.c.obj,esp_empty_wrapper, +libesp_wifi.a,esp_adapter.c.obj,wifi_calloc, +libesp_wifi.a,esp_adapter.c.obj,wifi_zalloc_wrapper, +libesp_wifi.a,esp_adapter.c.obj,env_is_chip_wrapper, +libesp_wifi.a,esp_adapter.c.obj,is_from_isr_wrapper, +libesp_wifi.a,esp_adapter.c.obj,semphr_give_from_isr_wrapper, +libesp_wifi.a,esp_adapter.c.obj,mutex_lock_wrapper, +libesp_wifi.a,esp_adapter.c.obj,mutex_unlock_wrapper, +libesp_wifi.a,esp_adapter.c.obj,task_ms_to_tick_wrapper, +libesp_wifi.a,esp_adapter.c.obj,wifi_apb80m_request_wrapper, +libesp_wifi.a,esp_adapter.c.obj,wifi_apb80m_release_wrapper, +libesp_wifi.a,esp_adapter.c.obj,timer_arm_wrapper, +libesp_wifi.a,esp_adapter.c.obj,wifi_malloc, +libesp_wifi.a,esp_adapter.c.obj,timer_disarm_wrapper, +libesp_wifi.a,esp_adapter.c.obj,timer_arm_us_wrapper, +libesp_wifi.a,esp_adapter.c.obj,wifi_rtc_enable_iso_wrapper, +libesp_wifi.a,esp_adapter.c.obj,wifi_rtc_disable_iso_wrapper, +libesp_wifi.a,esp_adapter.c.obj,malloc_internal_wrapper, +libesp_wifi.a,esp_adapter.c.obj,realloc_internal_wrapper, +libesp_wifi.a,esp_adapter.c.obj,calloc_internal_wrapper, +libesp_wifi.a,esp_adapter.c.obj,zalloc_internal_wrapper, +libesp_wifi.a,esp_adapter.c.obj,coex_status_get_wrapper, +libesp_wifi.a,esp_adapter.c.obj,coex_wifi_release_wrapper, +libfreertos.a,list.c.obj,uxListRemove,FALSE +libfreertos.a,list.c.obj,vListInitialise,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,list.c.obj,vListInitialiseItem,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,list.c.obj,vListInsert,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,list.c.obj,vListInsertEnd,FALSE +libfreertos.a,port.c.obj,vApplicationStackOverflowHook,FALSE +libfreertos.a,port.c.obj,vPortYieldOtherCore,FALSE +libfreertos.a,port.c.obj,vPortYield, +libfreertos.a,port_common.c.obj,xPortcheckValidStackMem, +libfreertos.a,port_common.c.obj,vApplicationGetTimerTaskMemory, +libfreertos.a,port_common.c.obj,esp_startup_start_app_common, +libfreertos.a,port_common.c.obj,xPortCheckValidTCBMem, +libfreertos.a,port_common.c.obj,vApplicationGetIdleTaskMemory, +libfreertos.a,port_systick.c.obj,vPortSetupTimer, +libfreertos.a,port_systick.c.obj,xPortSysTickHandler,FALSE +libfreertos.a,tasks.c.obj,__getreent,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,tasks.c.obj,pcTaskGetName,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,tasks.c.obj,prvDeleteTLS,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,tasks.c.obj,pvTaskIncrementMutexHeldCount,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,tasks.c.obj,taskSelectHighestPriorityTaskSMP,FALSE +libfreertos.a,tasks.c.obj,taskYIELD_OTHER_CORE,FALSE +libfreertos.a,tasks.c.obj,vTaskGetSnapshot,CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH +libfreertos.a,tasks.c.obj,vTaskInternalSetTimeOutState,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,tasks.c.obj,vTaskPlaceOnEventList,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,tasks.c.obj,vTaskPlaceOnEventListRestricted,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,tasks.c.obj,vTaskPlaceOnUnorderedEventList,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,tasks.c.obj,vTaskPriorityDisinheritAfterTimeout,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,tasks.c.obj,vTaskReleaseEventListLock,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,tasks.c.obj,vTaskTakeEventListLock,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,tasks.c.obj,xTaskCheckForTimeOut,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,tasks.c.obj,xTaskGetCurrentTaskHandle,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,tasks.c.obj,xTaskGetSchedulerState,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,tasks.c.obj,xTaskGetTickCount,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,tasks.c.obj,xTaskPriorityDisinherit,FALSE +libfreertos.a,tasks.c.obj,xTaskPriorityInherit,CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH +libfreertos.a,tasks.c.obj,prvGetExpectedIdleTime,FALSE +libfreertos.a,tasks.c.obj,vTaskStepTick,FALSE +libhal.a,brownout_hal.c.obj,brownout_hal_intr_clear, +libheap.a,heap_caps.c.obj,heap_caps_free, +libheap.a,heap_caps.c.obj,heap_caps_realloc_base, +libheap.a,heap_caps.c.obj,heap_caps_realloc, +libheap.a,heap_caps.c.obj,heap_caps_calloc, +libheap.a,heap_caps.c.obj,heap_caps_malloc_base, +libheap.a,heap_caps.c.obj,heap_caps_malloc, +libheap.a,heap_caps.c.obj,heap_caps_malloc_default, +libheap.a,heap_caps.c.obj,heap_caps_realloc_default, +libheap.a,heap_caps.c.obj,find_containing_heap, +libheap.a,multi_heap.c.obj,_multi_heap_lock, +libheap.a,multi_heap.c.obj,_multi_heap_unlock, +libheap.a,multi_heap.c.obj,multi_heap_in_rom_init, +liblog.a,log_freertos.c.obj,esp_log_timestamp, +liblog.a,log_freertos.c.obj,esp_log_impl_lock, +liblog.a,log_freertos.c.obj,esp_log_impl_unlock, +liblog.a,log_freertos.c.obj,esp_log_impl_lock_timeout, +liblog.a,log_freertos.c.obj,esp_log_early_timestamp, +liblog.a,log.c.obj,esp_log_write, +libnewlib.a,abort.c.obj,abort, +libnewlib.a,assert.c.obj,__assert_func, +libnewlib.a,assert.c.obj,newlib_include_assert_impl, +libnewlib.a,heap.c.obj,_calloc_r, +libnewlib.a,heap.c.obj,_free_r, +libnewlib.a,heap.c.obj,_malloc_r, +libnewlib.a,heap.c.obj,_realloc_r, +libnewlib.a,heap.c.obj,calloc, +libnewlib.a,heap.c.obj,cfree, +libnewlib.a,heap.c.obj,free, +libnewlib.a,heap.c.obj,malloc, +libnewlib.a,heap.c.obj,newlib_include_heap_impl, +libnewlib.a,heap.c.obj,realloc, +libnewlib.a,locks.c.obj,_lock_try_acquire_recursive, +libnewlib.a,locks.c.obj,_lock_release, +libnewlib.a,locks.c.obj,_lock_release_recursive, +libnewlib.a,locks.c.obj,__retarget_lock_init, +libnewlib.a,locks.c.obj,__retarget_lock_init_recursive, +libnewlib.a,locks.c.obj,__retarget_lock_close, +libnewlib.a,locks.c.obj,__retarget_lock_close_recursive, +libnewlib.a,locks.c.obj,__retarget_lock_acquire, +libnewlib.a,locks.c.obj,lock_init_generic, +libnewlib.a,locks.c.obj,__retarget_lock_acquire_recursive, +libnewlib.a,locks.c.obj,__retarget_lock_try_acquire, +libnewlib.a,locks.c.obj,__retarget_lock_try_acquire_recursive, +libnewlib.a,locks.c.obj,__retarget_lock_release, +libnewlib.a,locks.c.obj,__retarget_lock_release_recursive, +libnewlib.a,locks.c.obj,_lock_close, +libnewlib.a,locks.c.obj,lock_acquire_generic, +libnewlib.a,locks.c.obj,_lock_acquire, +libnewlib.a,locks.c.obj,_lock_acquire_recursive, +libnewlib.a,locks.c.obj,_lock_try_acquire, +libnewlib.a,reent_init.c.obj,esp_reent_init, +libnewlib.a,time.c.obj,_times_r, +libnewlib.a,time.c.obj,_gettimeofday_r, +libpp.a,pp_debug.o,wifi_gpio_debug, +libpthread.a,pthread.c.obj,pthread_mutex_lock_internal, +libpthread.a,pthread.c.obj,pthread_mutex_lock, +libpthread.a,pthread.c.obj,pthread_mutex_unlock, +libriscv.a,interrupt.c.obj,intr_handler_get, +libriscv.a,interrupt.c.obj,intr_handler_set, +libriscv.a,interrupt.c.obj,intr_matrix_route, diff --git a/examples/common/relinker/esp32c2_v5.2/library.csv b/examples/common/relinker/esp32c2_v5.2/library.csv new file mode 100644 index 000000000..6eed4d7cd --- /dev/null +++ b/examples/common/relinker/esp32c2_v5.2/library.csv @@ -0,0 +1,23 @@ +library,path +libble_app.a,$IDF_PATH/components/bt/controller/lib_esp32c2/esp32c2-bt-lib/libble_app.a +libpp.a,$IDF_PATH/components/esp_wifi/lib/esp32c2/libpp.a +libbootloader_support.a,./esp-idf/bootloader_support/libbootloader_support.a +libbt.a,./esp-idf/bt/libbt.a +libdriver.a,./esp-idf/driver/libdriver.a +libesp_app_format.a,./esp-idf/esp_app_format/libesp_app_format.a +libesp_hw_support.a,./esp-idf/esp_hw_support/libesp_hw_support.a +libesp_phy.a,./esp-idf/esp_phy/libesp_phy.a +libesp_pm.a,./esp-idf/esp_pm/libesp_pm.a +libesp_ringbuf.a,./esp-idf/esp_ringbuf/libesp_ringbuf.a +libesp_rom.a,./esp-idf/esp_rom/libesp_rom.a +libesp_system.a,./esp-idf/esp_system/libesp_system.a +libesp_timer.a,./esp-idf/esp_timer/libesp_timer.a +libesp_wifi.a,./esp-idf/esp_wifi/libesp_wifi.a +libfreertos.a,./esp-idf/freertos/libfreertos.a +libhal.a,./esp-idf/hal/libhal.a +libheap.a,./esp-idf/heap/libheap.a +liblog.a,./esp-idf/log/liblog.a +libnewlib.a,./esp-idf/newlib/libnewlib.a +libpthread.a,./esp-idf/pthread/libpthread.a +libriscv.a,./esp-idf/riscv/libriscv.a +libspi_flash.a,./esp-idf/spi_flash/libspi_flash.a diff --git a/examples/common/relinker/esp32c2_v5.2/object.csv b/examples/common/relinker/esp32c2_v5.2/object.csv new file mode 100644 index 000000000..6cff4e5a5 --- /dev/null +++ b/examples/common/relinker/esp32c2_v5.2/object.csv @@ -0,0 +1,67 @@ +library,object,path +libbootloader_support.a,bootloader_flash.c.obj,esp-idf/bootloader_support/CMakeFiles/__idf_bootloader_support.dir/bootloader_flash/src/bootloader_flash.c.obj +libbootloader_support.a,flash_encrypt.c.obj,esp-idf/bootloader_support/CMakeFiles/__idf_bootloader_support.dir/src/flash_encrypt.c.obj +libbt.a,bt_osi_mem.c.obj,esp-idf/bt/CMakeFiles/__idf_bt.dir/porting/mem/bt_osi_mem.c.obj +libbt.a,bt.c.obj,esp-idf/bt/CMakeFiles/__idf_bt.dir/controller/esp32c2/bt.c.obj +libbt.a,npl_os_freertos.c.obj,esp-idf/bt/CMakeFiles/__idf_bt.dir/porting/npl/freertos/src/npl_os_freertos.c.obj +libbt.a,nimble_port.c.obj,esp-idf/bt/CMakeFiles/__idf_bt.dir/host/nimble/nimble/porting/nimble/src/nimble_port.c.obj +libdriver.a,gpio.c.obj,esp-idf/driver/CMakeFiles/__idf_driver.dir/gpio/gpio.c.obj +libesp_app_format.a,esp_app_desc.c.obj,esp-idf/esp_app_format/CMakeFiles/__idf_esp_app_format.dir/esp_app_desc.c.obj +libesp_hw_support.a,cpu.c.obj,esp-idf/esp_hw_support/CMakeFiles/__idf_esp_hw_support.dir/cpu.c.obj +libesp_hw_support.a,esp_clk.c.obj,esp-idf/esp_hw_support/CMakeFiles/__idf_esp_hw_support.dir/esp_clk.c.obj +libesp_hw_support.a,esp_memory_utils.c.obj,esp-idf/esp_hw_support/CMakeFiles/__idf_esp_hw_support.dir/esp_memory_utils.c.obj +libesp_hw_support.a,hw_random.c.obj,esp-idf/esp_hw_support/CMakeFiles/__idf_esp_hw_support.dir/hw_random.c.obj +libesp_hw_support.a,intr_alloc.c.obj,esp-idf/esp_hw_support/CMakeFiles/__idf_esp_hw_support.dir/intr_alloc.c.obj +libesp_hw_support.a,periph_ctrl.c.obj,esp-idf/esp_hw_support/CMakeFiles/__idf_esp_hw_support.dir/periph_ctrl.c.obj +libesp_hw_support.a,regi2c_ctrl.c.obj,esp-idf/esp_hw_support/CMakeFiles/__idf_esp_hw_support.dir/regi2c_ctrl.c.obj +libesp_hw_support.a,rtc_clk.c.obj,esp-idf/esp_hw_support/CMakeFiles/__idf_esp_hw_support.dir/port/esp32c2/rtc_clk.c.obj +libesp_hw_support.a,rtc_init.c.obj,esp-idf/esp_hw_support/CMakeFiles/__idf_esp_hw_support.dir/port/esp32c2/rtc_init.c.obj +libesp_hw_support.a,rtc_module.c.obj,esp-idf/esp_hw_support/CMakeFiles/__idf_esp_hw_support.dir/rtc_module.c.obj +libesp_hw_support.a,rtc_sleep.c.obj,esp-idf/esp_hw_support/CMakeFiles/__idf_esp_hw_support.dir/port/esp32c2/rtc_sleep.c.obj +libesp_hw_support.a,rtc_time.c.obj,esp-idf/esp_hw_support/CMakeFiles/__idf_esp_hw_support.dir/port/esp32c2/rtc_time.c.obj +libesp_hw_support.a,sleep_modes.c.obj,esp-idf/esp_hw_support/CMakeFiles/__idf_esp_hw_support.dir/sleep_modes.c.obj +libesp_hw_support.a,systimer.c.obj,esp-idf/esp_hw_support/CMakeFiles/__idf_esp_hw_support.dir/port/esp32c2/systimer.c.obj +libesp_phy.a,phy_init.c.obj,esp-idf/esp_phy/CMakeFiles/__idf_esp_phy.dir/src/phy_init.c.obj +libesp_phy.a,phy_override.c.obj,esp-idf/esp_phy/CMakeFiles/__idf_esp_phy.dir/src/phy_override.c.obj +libesp_pm.a,pm_locks.c.obj,esp-idf/esp_pm/CMakeFiles/__idf_esp_pm.dir/pm_locks.c.obj +libesp_pm.a,pm_impl.c.obj,esp-idf/esp_pm/CMakeFiles/__idf_esp_pm.dir/pm_impl.c.obj +libesp_ringbuf.a,ringbuf.c.obj,esp-idf/esp_ringbuf/CMakeFiles/__idf_esp_ringbuf.dir/ringbuf.c.obj +libesp_rom.a,esp_rom_systimer.c.obj,esp-idf/esp_rom/CMakeFiles/__idf_esp_rom.dir/patches/esp_rom_systimer.c.obj +libesp_rom.a,esp_rom_uart.c.obj,esp-idf/esp_rom/CMakeFiles/__idf_esp_rom.dir/patches/esp_rom_uart.c.obj +libesp_system.a,brownout.c.obj,esp-idf/esp_system/CMakeFiles/__idf_esp_system.dir/port/brownout.c.obj +libesp_system.a,cache_err_int.c.obj,esp-idf/esp_system/CMakeFiles/__idf_esp_system.dir/port/soc/esp32c2/cache_err_int.c.obj +libesp_system.a,cpu_start.c.obj,esp-idf/esp_system/CMakeFiles/__idf_esp_system.dir/port/cpu_start.c.obj +libesp_system.a,crosscore_int.c.obj,esp-idf/esp_system/CMakeFiles/__idf_esp_system.dir/crosscore_int.c.obj +libesp_system.a,esp_system.c.obj,esp-idf/esp_system/CMakeFiles/__idf_esp_system.dir/esp_system.c.obj +libesp_system.a,panic.c.obj,esp-idf/esp_system/CMakeFiles/__idf_esp_system.dir/panic.c.obj +libesp_system.a,reset_reason.c.obj,esp-idf/esp_system/CMakeFiles/__idf_esp_system.dir/port/soc/esp32c2/reset_reason.c.obj +libesp_system.a,ubsan.c.obj,esp-idf/esp_system/CMakeFiles/__idf_esp_system.dir/ubsan.c.obj +libesp_timer.a,esp_timer.c.obj,esp-idf/esp_timer/CMakeFiles/__idf_esp_timer.dir/src/esp_timer.c.obj +libesp_timer.a,esp_timer_impl_systimer.c.obj,esp-idf/esp_timer/CMakeFiles/__idf_esp_timer.dir/src/esp_timer_impl_systimer.c.obj +libesp_timer.a,ets_timer_legacy.c.obj,esp-idf/esp_timer/CMakeFiles/__idf_esp_timer.dir/src/ets_timer_legacy.c.obj +libesp_timer.a,system_time.c.obj,esp-idf/esp_timer/CMakeFiles/__idf_esp_timer.dir/src/system_time.c.obj +libesp_wifi.a,esp_adapter.c.obj,esp-idf/esp_wifi/CMakeFiles/__idf_esp_wifi.dir/esp32c2/esp_adapter.c.obj +libfreertos.a,list.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/list.c.obj +libfreertos.a,port.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/portable/riscv/port.c.obj +libfreertos.a,port_common.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/port_common.c.obj +libfreertos.a,port_systick.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/port_systick.c.obj +libfreertos.a,queue.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/queue.c.obj +libfreertos.a,tasks.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/tasks.c.obj +libhal.a,brownout_hal.c.obj,esp-idf/hal/CMakeFiles/__idf_hal.dir/brownout_hal.c.obj +libheap.a,heap_caps.c.obj,esp-idf/heap/CMakeFiles/__idf_heap.dir/heap_caps.c.obj +libheap.a,multi_heap.c.obj,./esp-idf/heap/CMakeFiles/__idf_heap.dir/multi_heap.c.obj +liblog.a,log_freertos.c.obj,esp-idf/log/CMakeFiles/__idf_log.dir/log_freertos.c.obj +liblog.a,log.c.obj,esp-idf/log/CMakeFiles/__idf_log.dir/log.c.obj +libnewlib.a,abort.c.obj,esp-idf/newlib/CMakeFiles/__idf_newlib.dir/abort.c.obj +libnewlib.a,assert.c.obj,esp-idf/newlib/CMakeFiles/__idf_newlib.dir/assert.c.obj +libnewlib.a,heap.c.obj,esp-idf/newlib/CMakeFiles/__idf_newlib.dir/heap.c.obj +libnewlib.a,locks.c.obj,esp-idf/newlib/CMakeFiles/__idf_newlib.dir/locks.c.obj +libnewlib.a,reent_init.c.obj,esp-idf/newlib/CMakeFiles/__idf_newlib.dir/reent_init.c.obj +libnewlib.a,time.c.obj,esp-idf/newlib/CMakeFiles/__idf_newlib.dir/time.c.obj +libpthread.a,pthread.c.obj,esp-idf/pthread/CMakeFiles/__idf_pthread.dir/pthread.c.obj +libriscv.a,interrupt.c.obj,esp-idf/riscv/CMakeFiles/__idf_riscv.dir/interrupt.c.obj +libspi_flash.a,flash_brownout_hook.c.obj,esp-idf/spi_flash/CMakeFiles/__idf_spi_flash.dir/flash_brownout_hook.c.obj +libspi_flash.a,flash_ops.c.obj,esp-idf/spi_flash/CMakeFiles/__idf_spi_flash.dir/flash_ops.c.obj +libspi_flash.a,memspi_host_driver.c.obj,esp-idf/spi_flash/CMakeFiles/__idf_spi_flash.dir/memspi_host_driver.c.obj +libspi_flash.a,spi_flash_os_func_app.c.obj,esp-idf/spi_flash/CMakeFiles/__idf_spi_flash.dir/spi_flash_os_func_app.c.obj +libspi_flash.a,spi_flash_os_func_noos.c.obj,esp-idf/spi_flash/CMakeFiles/__idf_spi_flash.dir/spi_flash_os_func_noos.c.obj diff --git a/examples/generic_switch/CMakeLists.txt b/examples/generic_switch/CMakeLists.txt index 8406f4eec..9c59282d5 100644 --- a/examples/generic_switch/CMakeLists.txt +++ b/examples/generic_switch/CMakeLists.txt @@ -33,6 +33,7 @@ set(MATTER_SDK_PATH ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip) # This should be done before using the IDF_TARGET variable. include($ENV{IDF_PATH}/tools/cmake/project.cmake) include($ENV{ESP_MATTER_DEVICE_PATH}/esp_matter_device.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/../common/cmake_common/components_include.cmake) set(EXTRA_COMPONENT_DIRS "${ESP_MATTER_PATH}/examples/common" diff --git a/examples/generic_switch/sdkconfig.defaults.esp32c2 b/examples/generic_switch/sdkconfig.defaults.esp32c2 index 6d354f182..45a1da886 100644 --- a/examples/generic_switch/sdkconfig.defaults.esp32c2 +++ b/examples/generic_switch/sdkconfig.defaults.esp32c2 @@ -160,8 +160,3 @@ CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=256 # ESP Matter CONFIG_ESP_MATTER_MAX_DEVICE_TYPE_COUNT=4 CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=4 - -# CMake Utilities -CONFIG_CU_RELINKER_ENABLE=y -CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y -CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2" diff --git a/examples/generic_switch/sdkconfig.defaults.esp32c2.v5.1 b/examples/generic_switch/sdkconfig.defaults.esp32c2.v5.1 new file mode 100644 index 000000000..245ec1227 --- /dev/null +++ b/examples/generic_switch/sdkconfig.defaults.esp32c2.v5.1 @@ -0,0 +1,4 @@ +# CMake Utilities +CONFIG_CU_RELINKER_ENABLE=y +CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y +CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2_v5.1" diff --git a/examples/generic_switch/sdkconfig.defaults.esp32c2.v5.2 b/examples/generic_switch/sdkconfig.defaults.esp32c2.v5.2 new file mode 100644 index 000000000..5d4ed95fe --- /dev/null +++ b/examples/generic_switch/sdkconfig.defaults.esp32c2.v5.2 @@ -0,0 +1,4 @@ +# CMake Utilities +CONFIG_CU_RELINKER_ENABLE=y +CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y +CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2_v5.2" diff --git a/examples/light/CMakeLists.txt b/examples/light/CMakeLists.txt index a54a069e6..0e38e605d 100644 --- a/examples/light/CMakeLists.txt +++ b/examples/light/CMakeLists.txt @@ -14,6 +14,7 @@ set(MATTER_SDK_PATH ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip) # This should be done before using the IDF_TARGET variable. include($ENV{IDF_PATH}/tools/cmake/project.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/../common/cmake_common/components_include.cmake) set(EXTRA_COMPONENT_DIRS "${ESP_MATTER_PATH}/examples/common" diff --git a/examples/light/sdkconfig.defaults.esp32c2 b/examples/light/sdkconfig.defaults.esp32c2 index 125c77e0f..540d7e147 100644 --- a/examples/light/sdkconfig.defaults.esp32c2 +++ b/examples/light/sdkconfig.defaults.esp32c2 @@ -161,11 +161,6 @@ CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=256 CONFIG_ESP_MATTER_MAX_DEVICE_TYPE_COUNT=4 CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=4 -# CMake Utilities -CONFIG_CU_RELINKER_ENABLE=y -CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y -CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2" - # ESP32-C2-DevKitM-1 Settings # Buttons CONFIG_BSP_BUTTONS_NUM=1 diff --git a/examples/light/sdkconfig.defaults.esp32c2.v5.1 b/examples/light/sdkconfig.defaults.esp32c2.v5.1 new file mode 100644 index 000000000..245ec1227 --- /dev/null +++ b/examples/light/sdkconfig.defaults.esp32c2.v5.1 @@ -0,0 +1,4 @@ +# CMake Utilities +CONFIG_CU_RELINKER_ENABLE=y +CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y +CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2_v5.1" diff --git a/examples/light/sdkconfig.defaults.esp32c2.v5.2 b/examples/light/sdkconfig.defaults.esp32c2.v5.2 new file mode 100644 index 000000000..5d4ed95fe --- /dev/null +++ b/examples/light/sdkconfig.defaults.esp32c2.v5.2 @@ -0,0 +1,4 @@ +# CMake Utilities +CONFIG_CU_RELINKER_ENABLE=y +CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y +CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2_v5.2" diff --git a/examples/light_switch/CMakeLists.txt b/examples/light_switch/CMakeLists.txt index 57eb801f5..d30c82e76 100644 --- a/examples/light_switch/CMakeLists.txt +++ b/examples/light_switch/CMakeLists.txt @@ -33,6 +33,7 @@ set(MATTER_SDK_PATH ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip) # This should be done before using the IDF_TARGET variable. include($ENV{IDF_PATH}/tools/cmake/project.cmake) include($ENV{ESP_MATTER_DEVICE_PATH}/esp_matter_device.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/../common/cmake_common/components_include.cmake) set(EXTRA_COMPONENT_DIRS "${ESP_MATTER_PATH}/examples/common" diff --git a/examples/light_switch/sdkconfig.defaults.esp32c2 b/examples/light_switch/sdkconfig.defaults.esp32c2 index 6d354f182..45a1da886 100644 --- a/examples/light_switch/sdkconfig.defaults.esp32c2 +++ b/examples/light_switch/sdkconfig.defaults.esp32c2 @@ -160,8 +160,3 @@ CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=256 # ESP Matter CONFIG_ESP_MATTER_MAX_DEVICE_TYPE_COUNT=4 CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=4 - -# CMake Utilities -CONFIG_CU_RELINKER_ENABLE=y -CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y -CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2" diff --git a/examples/light_switch/sdkconfig.defaults.esp32c2.v5.1 b/examples/light_switch/sdkconfig.defaults.esp32c2.v5.1 new file mode 100644 index 000000000..245ec1227 --- /dev/null +++ b/examples/light_switch/sdkconfig.defaults.esp32c2.v5.1 @@ -0,0 +1,4 @@ +# CMake Utilities +CONFIG_CU_RELINKER_ENABLE=y +CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y +CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2_v5.1" diff --git a/examples/light_switch/sdkconfig.defaults.esp32c2.v5.2 b/examples/light_switch/sdkconfig.defaults.esp32c2.v5.2 new file mode 100644 index 000000000..5d4ed95fe --- /dev/null +++ b/examples/light_switch/sdkconfig.defaults.esp32c2.v5.2 @@ -0,0 +1,4 @@ +# CMake Utilities +CONFIG_CU_RELINKER_ENABLE=y +CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y +CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2_v5.2" diff --git a/examples/refrigerator/CMakeLists.txt b/examples/refrigerator/CMakeLists.txt index d9d17b1b1..9667937d2 100644 --- a/examples/refrigerator/CMakeLists.txt +++ b/examples/refrigerator/CMakeLists.txt @@ -34,6 +34,7 @@ set(ZAP_GENERATED_PATH ${CMAKE_CURRENT_LIST_DIR}/main/zap-generated) # This should be done before using the IDF_TARGET variable. include($ENV{IDF_PATH}/tools/cmake/project.cmake) include($ENV{ESP_MATTER_DEVICE_PATH}/esp_matter_device.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/../common/cmake_common/components_include.cmake) set(EXTRA_COMPONENT_DIRS "${ESP_MATTER_PATH}/examples/common" diff --git a/examples/refrigerator/sdkconfig.defaults.esp32c2.v5.1 b/examples/refrigerator/sdkconfig.defaults.esp32c2.v5.1 new file mode 100644 index 000000000..245ec1227 --- /dev/null +++ b/examples/refrigerator/sdkconfig.defaults.esp32c2.v5.1 @@ -0,0 +1,4 @@ +# CMake Utilities +CONFIG_CU_RELINKER_ENABLE=y +CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y +CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2_v5.1" diff --git a/examples/refrigerator/sdkconfig.defaults.esp32c2.v5.2 b/examples/refrigerator/sdkconfig.defaults.esp32c2.v5.2 new file mode 100644 index 000000000..5d4ed95fe --- /dev/null +++ b/examples/refrigerator/sdkconfig.defaults.esp32c2.v5.2 @@ -0,0 +1,4 @@ +# CMake Utilities +CONFIG_CU_RELINKER_ENABLE=y +CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y +CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2_v5.2" diff --git a/examples/room_air_conditioner/CMakeLists.txt b/examples/room_air_conditioner/CMakeLists.txt index 065263544..098df5ece 100644 --- a/examples/room_air_conditioner/CMakeLists.txt +++ b/examples/room_air_conditioner/CMakeLists.txt @@ -33,6 +33,7 @@ set(MATTER_SDK_PATH ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip) # This should be done before using the IDF_TARGET variable. include($ENV{IDF_PATH}/tools/cmake/project.cmake) include($ENV{ESP_MATTER_DEVICE_PATH}/esp_matter_device.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/../common/cmake_common/components_include.cmake) set(EXTRA_COMPONENT_DIRS "${ESP_MATTER_PATH}/examples/common" diff --git a/examples/room_air_conditioner/sdkconfig.defaults.esp32c2 b/examples/room_air_conditioner/sdkconfig.defaults.esp32c2 index 6d354f182..45a1da886 100644 --- a/examples/room_air_conditioner/sdkconfig.defaults.esp32c2 +++ b/examples/room_air_conditioner/sdkconfig.defaults.esp32c2 @@ -160,8 +160,3 @@ CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=256 # ESP Matter CONFIG_ESP_MATTER_MAX_DEVICE_TYPE_COUNT=4 CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=4 - -# CMake Utilities -CONFIG_CU_RELINKER_ENABLE=y -CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y -CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2" diff --git a/examples/room_air_conditioner/sdkconfig.defaults.esp32c2.v5.1 b/examples/room_air_conditioner/sdkconfig.defaults.esp32c2.v5.1 new file mode 100644 index 000000000..245ec1227 --- /dev/null +++ b/examples/room_air_conditioner/sdkconfig.defaults.esp32c2.v5.1 @@ -0,0 +1,4 @@ +# CMake Utilities +CONFIG_CU_RELINKER_ENABLE=y +CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y +CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2_v5.1" diff --git a/examples/room_air_conditioner/sdkconfig.defaults.esp32c2.v5.2 b/examples/room_air_conditioner/sdkconfig.defaults.esp32c2.v5.2 new file mode 100644 index 000000000..5d4ed95fe --- /dev/null +++ b/examples/room_air_conditioner/sdkconfig.defaults.esp32c2.v5.2 @@ -0,0 +1,4 @@ +# CMake Utilities +CONFIG_CU_RELINKER_ENABLE=y +CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y +CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2_v5.2" diff --git a/examples/zap_light/CMakeLists.txt b/examples/zap_light/CMakeLists.txt index 291758199..950671444 100644 --- a/examples/zap_light/CMakeLists.txt +++ b/examples/zap_light/CMakeLists.txt @@ -33,6 +33,7 @@ set(MATTER_SDK_PATH ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip) # This should be done before using the IDF_TARGET variable. include($ENV{IDF_PATH}/tools/cmake/project.cmake) include($ENV{ESP_MATTER_DEVICE_PATH}/esp_matter_device.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/../common/cmake_common/components_include.cmake) set(EXTRA_COMPONENT_DIRS "${ESP_MATTER_PATH}/examples/common" diff --git a/examples/zap_light/sdkconfig.defaults.esp32c2 b/examples/zap_light/sdkconfig.defaults.esp32c2 index 6d354f182..45a1da886 100644 --- a/examples/zap_light/sdkconfig.defaults.esp32c2 +++ b/examples/zap_light/sdkconfig.defaults.esp32c2 @@ -160,8 +160,3 @@ CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=256 # ESP Matter CONFIG_ESP_MATTER_MAX_DEVICE_TYPE_COUNT=4 CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=4 - -# CMake Utilities -CONFIG_CU_RELINKER_ENABLE=y -CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y -CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2" diff --git a/examples/zap_light/sdkconfig.defaults.esp32c2.v5.1 b/examples/zap_light/sdkconfig.defaults.esp32c2.v5.1 new file mode 100644 index 000000000..245ec1227 --- /dev/null +++ b/examples/zap_light/sdkconfig.defaults.esp32c2.v5.1 @@ -0,0 +1,4 @@ +# CMake Utilities +CONFIG_CU_RELINKER_ENABLE=y +CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y +CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2_v5.1" diff --git a/examples/zap_light/sdkconfig.defaults.esp32c2.v5.2 b/examples/zap_light/sdkconfig.defaults.esp32c2.v5.2 new file mode 100644 index 000000000..5d4ed95fe --- /dev/null +++ b/examples/zap_light/sdkconfig.defaults.esp32c2.v5.2 @@ -0,0 +1,4 @@ +# CMake Utilities +CONFIG_CU_RELINKER_ENABLE=y +CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y +CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2_v5.2"