Commit b64dee87 authored by Mariusz Poslinski's avatar Mariusz Poslinski Committed by Carles Cufi
Browse files

module: openthread: align configs with upstream 

Change OT_DNS_QUERY_UPSTREAM to OT_DNS_UPSTREAM_QUERY.
Remove unused OT_CHILD_SUPERVISION config.
Added:
CONFIG_OPENTHREAD_THREAD_VERSION_1_3_1 -> OT_THREAD_VERSION_1_3_1
CONFIG_OPENTHREAD_DNS_CLIENT_OVER_TCP -> OT_DNS_CLIENT_OVER_TCP
CONFIG_OPENTHREAD_POWER_SUPPLY -> OT_POWER_SUPPLY

Signed-off-by: default avatarMariusz Poslinski <mariusz.poslinski@nordicsemi.no>
parent 255bb6b5

modules/openthread/CMakeLists.txt

+7 −9
Changes for modules/openthread/CMakeLists.txt: 7 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -94,12 +94,6 @@ else() 
  set(OT_CHANNEL_MONITOR OFF CACHE BOOL "Enable channel monitor support" FORCE)

endif()



if(CONFIG_OPENTHREAD_CHILD_SUPERVISION)

  set(OT_CHILD_SUPERVISION ON CACHE BOOL "Enable child supervision support" FORCE)

else()

  set(OT_CHILD_SUPERVISION OFF CACHE BOOL "Enable child supervision support" FORCE)

endif()



if(CONFIG_OPENTHREAD_COAP)

  set(OT_COAP ON CACHE BOOL "Enable CoAP API" FORCE)

else()
@@ -184,10 +178,10 @@ else() 
  set(OT_DNS_DSO OFF CACHE BOOL "Enable DNS Stateful Operations (DSO) support" FORCE)

endif()



if(CONFIG_OPENTHREAD_DNS_QUERY_UPSTREAM)

  set(OT_DNS_QUERY_UPSTREAM ON CACHE BOOL "Enable forwarding DNS queries to upstream" FORCE)

if(CONFIG_OPENTHREAD_DNS_UPSTREAM_QUERY)

  set(OT_DNS_UPSTREAM_QUERY ON CACHE BOOL "Enable forwarding DNS queries to upstream" FORCE)

else()

  set(OT_DNS_QUERY_UPSTREAM OFF CACHE BOOL "Enable forwarding DNS queries to upstream" FORCE)

  set(OT_DNS_UPSTREAM_QUERY OFF CACHE BOOL "Enable forwarding DNS queries to upstream" FORCE)

endif()



if(CONFIG_OPENTHREAD_DNSSD_SERVER)
@@ -376,6 +370,10 @@ else() 
  set(OT_PLATFORM_UDP OFF CACHE BOOL "Enable platform UDP support" FORCE)

endif()



if(CONFIG_OPENTHREAD_POWER_SUPPLY)

  set(OT_POWER_SUPPLY ${CONFIG_OPENTHREAD_POWER_SUPPLY} CACHE STRING "Power supply configuration" FORCE)

endif()



if(CONFIG_OPENTHREAD_RADIO_LINK_IEEE_802_15_4_ENABLE)

  set(OT_15_4 ON CACHE BOOL "Enable 802.15.4 radio" FORCE)

else()

modules/openthread/Kconfig.features

+30 −4
Changes for modules/openthread/Kconfig.features: 30 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ config OPENTHREAD_THREAD_VERSION_1_2 
	bool "Version 1.2"

config OPENTHREAD_THREAD_VERSION_1_3

	bool "Version 1.3"

config OPENTHREAD_THREAD_VERSION_1_3_1

	bool "Version 1.3.1"

endchoice



config OPENTHREAD_THREAD_VERSION
@@ -22,6 +24,7 @@ config OPENTHREAD_THREAD_VERSION 
	default "1.1" if OPENTHREAD_THREAD_VERSION_1_1

	default "1.2" if OPENTHREAD_THREAD_VERSION_1_2

	default "1.3" if OPENTHREAD_THREAD_VERSION_1_3

	default "1.3.1" if OPENTHREAD_THREAD_VERSION_1_3_1

	default "unknown"



config OPENTHREAD_ANYCAST_LOCATOR
@@ -55,9 +58,6 @@ config OPENTHREAD_CHANNEL_MANAGER 
	bool "Channel manager support"

	depends on OPENTHREAD_CHANNEL_MONITOR



config OPENTHREAD_CHILD_SUPERVISION

	bool "Child supervision support"



config OPENTHREAD_COAP

	bool "OpenThread CoAP support"

	help
@@ -109,7 +109,7 @@ config OPENTHREAD_DNS_CLIENT 
config OPENTHREAD_DNS_DSO

	bool "DNS Stateful Operations (DSO) support"



config OPENTHREAD_DNS_QUERY_UPSTREAM

config OPENTHREAD_DNS_UPSTREAM_QUERY

	bool "Forwarding DNS queries to upstream"

	help

	  Enable forwarding DNS queries to platform DNS upstream API
@@ -220,6 +220,32 @@ config OPENTHREAD_PLATFORM_NETIF 
config OPENTHREAD_PLATFORM_UDP

	bool "Platform UDP support"



choice OPENTHREAD_POWER_SUPPLY_CHOICE

	prompt "Power supply configuration"

	default OPENTHREAD_POWER_SUPPLY_EXTERNAL



config OPENTHREAD_POWER_SUPPLY_BATTERY

	bool "OT_POWER_SUPPLY_BATTERY"



config OPENTHREAD_POWER_SUPPLY_EXTERNAL

	bool "OT_POWER_SUPPLY_EXTERNAL"



config OPENTHREAD_POWER_SUPPLY_EXTERNAL_STABLE

	bool "OT_POWER_SUPPLY_EXTERNAL_STABLE"



config OPENTHREAD_POWER_SUPPLY_EXTERNAL_UNSTABLE

	bool "OT_POWER_SUPPLY_EXTERNAL_UNSTABLE"

endchoice



config OPENTHREAD_POWER_SUPPLY

	string

	prompt "Power supply configuration"

	default "BATTERY" if OPENTHREAD_POWER_SUPPLY_BATTERY

	default "EXTERNAL" if OPENTHREAD_POWER_SUPPLY_EXTERNAL

	default "EXTERNAL_STABLE" if OPENTHREAD_POWER_SUPPLY_EXTERNAL_STABLE

	default "EXTERNAL_UNSTABLE" if OPENTHREAD_POWER_SUPPLY_EXTERNAL_UNSTABLE

	default ""



config OPENTHREAD_RAW

	bool "Raw Link support"

CRA Git | Maintained and supported by SUSTech CRA and CCSE