Skip to content

Commit a7f6e95

Browse files
shubhamdppull[bot]
authored andcommitted
[ESP32] Kconfig fixes and link error fix for h2 (#26825)
* [ESP32] Do not select factory data provider and device instance info provider when secure cert dac provider is selected * Fix the linker error when building for esp32h2 * Move ieee802154 under openthread config
1 parent 69ef7e0 commit a7f6e95

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

config/esp32/components/chip/CMakeLists.txt

+9
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,9 @@ endif()
359359
if(CONFIG_OPENTHREAD_ENABLED)
360360
idf_component_get_property(openthread_lib openthread COMPONENT_LIB)
361361
list(APPEND chip_libraries $<TARGET_FILE:${openthread_lib}>)
362+
363+
idf_component_get_property(ieee802154_lib ieee802154 COMPONENT_LIB)
364+
list(APPEND chip_libraries $<TARGET_FILE:${ieee802154_lib}>)
362365
endif()
363366

364367
if((NOT CONFIG_USE_MINIMAL_MDNS) AND (CONFIG_ENABLE_WIFI_STATION OR CONFIG_ENABLE_WIFI_AP))
@@ -436,6 +439,12 @@ list(APPEND chip_libraries $<TARGET_FILE:${soc_lib}>)
436439
idf_component_get_property(efuse_lib efuse COMPONENT_LIB)
437440
list(APPEND chip_libraries $<TARGET_FILE:${efuse_lib}>)
438441

442+
idf_component_get_property(vfs_lib vfs COMPONENT_LIB)
443+
list(APPEND chip_libraries $<TARGET_FILE:${vfs_lib}>)
444+
445+
idf_component_get_property(driver_lib driver COMPONENT_LIB)
446+
list(APPEND chip_libraries $<TARGET_FILE:${driver_lib}>)
447+
439448
target_link_libraries(${COMPONENT_LIB} INTERFACE -Wl,--start-group
440449
${chip_libraries}
441450
$<TARGET_FILE:mbedcrypto> $<TARGET_FILE:mbedx509>

config/esp32/components/chip/Kconfig

+1-4
Original file line numberDiff line numberDiff line change
@@ -705,12 +705,9 @@ menu "CHIP Device Layer"
705705
depends on SEC_CERT_DAC_PROVIDER && SOC_ECDSA_SUPPORTED
706706
default y
707707
select MBEDTLS_HARDWARE_ECDSA_SIGN
708-
select ENABLE_ESP32_FACTORY_DATA_PROVIDER
709-
select ENABLE_ESP32_DEVICE_INSTANCE_INFO_PROVIDER
710708
help
711709
If DAC is being read from secure cert and SOC supports ECDSA signing using on-chip peripheral
712-
then this option gets enabled. This option also selects few more that are required for commissioning
713-
the device.
710+
then this option gets enabled.
714711
Also, please disable ESP_SECURE_CERT_DS_PERIPHERAL from the menuconfig when this option is disabled
715712

716713
endmenu

0 commit comments

Comments
 (0)