From 85c668b7c7ac66d2f2f1888375e5e7e99733fa6c Mon Sep 17 00:00:00 2001 From: Shu Chen Date: Wed, 29 Jun 2022 15:43:08 +0800 Subject: [PATCH] build: move build_from_src options to env --- components/ieee802154/CMakeLists.txt | 2 +- components/ieee802154/Kconfig | 7 ------- components/openthread/CMakeLists.txt | 2 +- components/openthread/Kconfig | 7 ------- examples/openthread/ot_rcp/sdkconfig.defaults | 1 - 5 files changed, 2 insertions(+), 17 deletions(-) diff --git a/components/ieee802154/CMakeLists.txt b/components/ieee802154/CMakeLists.txt index 4dddf17a2a..65f3f1760d 100644 --- a/components/ieee802154/CMakeLists.txt +++ b/components/ieee802154/CMakeLists.txt @@ -7,7 +7,7 @@ idf_component_register( if(CONFIG_IEEE802154_ENABLED) idf_component_get_property(esp_phy_lib esp_phy COMPONENT_LIB) - if(CONFIG_IEEE802154_LIB_FROM_INTERNAL_SRC) + if($ENV{IEEE802154_LIB_FROM_INTERNAL_SRC}) idf_component_get_property(ieee802154_lib ieee802154_driver COMPONENT_LIB) target_link_libraries(${COMPONENT_LIB} INTERFACE $ $ libphy.a libbtbb.a) diff --git a/components/ieee802154/Kconfig b/components/ieee802154/Kconfig index f8fe6a41f5..7fa431f4b3 100644 --- a/components/ieee802154/Kconfig +++ b/components/ieee802154/Kconfig @@ -5,11 +5,4 @@ menu "IEEE 802.15.4" bool default "y" if IDF_TARGET_ESP32H2 - config IEEE802154_LIB_FROM_INTERNAL_SRC - bool "Build IEEE 802.15.4 libraries from source" - depends on IEEE802154_ENABLED - default n - help - Override the shipped lib802154.a for internal builds. - endmenu # IEEE 802.15.4 diff --git a/components/openthread/CMakeLists.txt b/components/openthread/CMakeLists.txt index 00d9b02fe3..e35d02730f 100644 --- a/components/openthread/CMakeLists.txt +++ b/components/openthread/CMakeLists.txt @@ -165,7 +165,7 @@ if(CONFIG_OPENTHREAD_ENABLED) file(WRITE ${CMAKE_BINARY_DIR}/rcp_version ${OT_FULL_VERSION_STRING}) endif() - if(CONFIG_OPENTHREAD_ESP_LIB_FROM_INTERNAL_SRC) + if($ENV{OPENTHREAD_ESP_LIB_FROM_INTERNAL_SRC}) idf_component_get_property(openthread_port_lib openthread_port COMPONENT_LIB) idf_component_get_property(lwip_lib lwip COMPONENT_LIB) idf_component_get_property(esp_netif_lib esp_netif COMPONENT_LIB) diff --git a/components/openthread/Kconfig b/components/openthread/Kconfig index 4a21926fe5..461b090cc8 100644 --- a/components/openthread/Kconfig +++ b/components/openthread/Kconfig @@ -92,13 +92,6 @@ menu "OpenThread" help Select this option to enable border router features in OpenThread. - config OPENTHREAD_ESP_LIB_FROM_INTERNAL_SRC - bool "Build esp_openthread libraries from source" - depends on OPENTHREAD_ENABLED - default n - help - Override the shipped libopenthread_br.a and libopenthread_port.a, for internal builds. - config OPENTHREAD_NUM_MESSAGE_BUFFERS int "The number of openthread message buffers" depends on OPENTHREAD_ENABLED diff --git a/examples/openthread/ot_rcp/sdkconfig.defaults b/examples/openthread/ot_rcp/sdkconfig.defaults index fe3a8c762b..80db98a9ea 100644 --- a/examples/openthread/ot_rcp/sdkconfig.defaults +++ b/examples/openthread/ot_rcp/sdkconfig.defaults @@ -36,7 +36,6 @@ CONFIG_OPENTHREAD_DIAG=y CONFIG_OPENTHREAD_COMMISSIONER=n CONFIG_OPENTHREAD_JOINER=n CONFIG_OPENTHREAD_BORDER_ROUTER=n -CONFIG_OPENTHREAD_ESP_LIB_FROM_INTERNAL_SRC=n # end of OpenThread