소스 검색

Merge branch 'feature/hide_build_from_src' into 'master'

build: move build_from_src options to env

See merge request espressif/esp-idf!18735
Shu Chen 3 년 전
부모
커밋
87f9fbaed1

+ 1 - 1
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 $<TARGET_FILE:${ieee802154_lib}>
                             $<TARGET_FILE:${esp_phy_lib}> libphy.a libbtbb.a)

+ 0 - 7
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

+ 1 - 1
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)

+ 0 - 7
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

+ 0 - 1
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