Skip to content

[nrf fromlist] manifest: openthread: Regular OpenThread upmerge #2054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 1, 2024
Merged

[nrf fromlist] manifest: openthread: Regular OpenThread upmerge #2054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b46f1e
[nrf fromlist] manifest: openthread: Regular OpenThread upmerge
maciejbaczmanski Sep 30, 2024
14dd7e8
[nrf fromlist] net: openthread: add `OPENTHREAD_STORE_FRAME_COUNTER_A…
maciejbaczmanski Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions modules/openthread/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ kconfig_to_ot_option(CONFIG_OPENTHREAD_BACKBONE_ROUTER_MULTICAST_ROUTING OT_BACK
kconfig_to_ot_option(CONFIG_OPENTHREAD_BLE_TCAT OT_BLE_TCAT "Enable BLE TCAT support")
kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_AGENT OT_BORDER_AGENT "Enable Border Agent")
kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_AGENT_EPHEMERAL_KEY_ENABLE OT_BORDER_AGENT_EPSKC "Border agent ephemeral PSKc")
kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_AGENT_ID OT_BORDER_AGENT_ID "Create and save border agent ID")
kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_ROUTER OT_BORDER_ROUTER "Enable Border Router")
kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_ROUTING OT_BORDER_ROUTING "Enable Border routing")
kconfig_to_ot_option(CONFIG_OPENTHREAD_BORDER_ROUTING_COUNTERS OT_BORDER_ROUTING_COUNTERS "Enable Border routing counters")
Expand All @@ -70,8 +71,10 @@ kconfig_to_ot_option(CONFIG_OPENTHREAD_DNS_CLIENT OT_DNS_CLIENT "Enable DNS clie
kconfig_to_ot_option(CONFIG_OPENTHREAD_DNS_CLIENT_OVER_TCP OT_DNS_CLIENT_OVER_TCP "Enable dns query over tcp")
kconfig_to_ot_option(CONFIG_OPENTHREAD_DNS_DSO OT_DNS_DSO "Enable DNS Stateful Operations (DSO) support")
kconfig_to_ot_option(CONFIG_OPENTHREAD_DNS_UPSTREAM_QUERY OT_DNS_UPSTREAM_QUERY "Enable forwarding DNS queries to upstream")
kconfig_to_ot_option(CONFIG_OPENTHREAD_DNSSD_DISCOVERY_PROXY OT_DNSSD_DISCOVERY_PROXY "Enable DNS-SD discovery proxy support")
kconfig_to_ot_option(CONFIG_OPENTHREAD_DNSSD_SERVER OT_DNSSD_SERVER "Enable DNS-SD server support")
kconfig_to_ot_option(CONFIG_OPENTHREAD_DUA OT_DUA "Enable Domain Unicast Address feature for Thread 1.2")
kconfig_to_ot_option(CONFIG_OPENTHREAD_DYNAMIC_STORE_FRAME_AHEAD_COUNTER OT_DYNAMIC_STORE_FRAME_AHEAD_COUNTER "Enable dynamic store frame ahead counter")
kconfig_to_ot_option(CONFIG_OPENTHREAD_ECDSA OT_ECDSA "Enable ECDSA support")
kconfig_to_ot_option(CONFIG_OPENTHREAD_ENABLE_SERVICE OT_SERVICE "Enable Service entries in Thread Network Data")
kconfig_to_ot_option(CONFIG_OPENTHREAD_EXTERNAL_HEAP OT_EXTERNAL_HEAP "Enable external heap support")
Expand Down Expand Up @@ -99,6 +102,7 @@ kconfig_to_ot_option(CONFIG_OPENTHREAD_NAT64_BORDER_ROUTING OT_NAT64_BORDER_ROUT
kconfig_to_ot_option(CONFIG_OPENTHREAD_NAT64_TRANSLATOR OT_NAT64_TRANSLATOR "Enable NAT64 translator")
kconfig_to_ot_option(CONFIG_OPENTHREAD_NEIGHBOR_DISCOVERY_AGENT OT_NEIGHBOR_DISCOVERY_AGENT "Enable neighbor discovery agent support")
kconfig_to_ot_option(CONFIG_OPENTHREAD_NETDIAG_CLIENT OT_NETDIAG_CLIENT "Enable TMF network diagnostics on clients")
kconfig_to_ot_option(CONFIG_OPENTHREAD_NETDIAG_VENDOR_INFO OT_NETDIAG_VENDOR_INFO "Allow setting vendor info at runtime")
kconfig_to_ot_option(CONFIG_OPENTHREAD_NETDATA_PUBLISHER OT_NETDATA_PUBLISHER "Enable Thread Network Data publisher")
kconfig_to_ot_option(CONFIG_OPENTHREAD_OPERATIONAL_DATASET_AUTO_INIT OT_OPERATIONAL_DATASET_AUTO_INIT "Enable operational dataset auto init")
kconfig_to_ot_option(CONFIG_OPENTHREAD_OTNS OT_OTNS "Enable OTNS support")
Expand Down
12 changes: 12 additions & 0 deletions modules/openthread/Kconfig.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ config OPENTHREAD_BORDER_AGENT
config OPENTHREAD_BORDER_AGENT_EPHEMERAL_KEY_ENABLE
bool "Border agent ephemeral PSKc"

config OPENTHREAD_BORDER_AGENT_ID
bool "Create and save border agent ID"

config OPENTHREAD_BORDER_ROUTER
bool "Border Router support"

Expand Down Expand Up @@ -150,6 +153,9 @@ config OPENTHREAD_DNS_UPSTREAM_QUERY
help
Enable forwarding DNS queries to platform DNS upstream API

config OPENTHREAD_DNSSD_DISCOVERY_PROXY
bool "DNS-SD discovery proxy support"

config OPENTHREAD_DNSSD_SERVER
bool "DNS-SD server support"

Expand All @@ -158,6 +164,9 @@ config OPENTHREAD_DUA
help
Enable Domain Unicast Address feature for Thread 1.2

config OPENTHREAD_DYNAMIC_STORE_FRAME_AHEAD_COUNTER
bool "Dynamic store frame ahead counter"

config OPENTHREAD_ECDSA
bool "ECDSA support"

Expand Down Expand Up @@ -248,6 +257,9 @@ config OPENTHREAD_NAT64_TRANSLATOR
config OPENTHREAD_NETDIAG_CLIENT
bool "TMF network diagnostics on client"

config OPENTHREAD_NETDIAG_VENDOR_INFO
bool "Allow setting vendor info at runtime"

config OPENTHREAD_NEIGHBOR_DISCOVERY_AGENT
bool "Neighbor discovery agent support"

Expand Down
10 changes: 8 additions & 2 deletions modules/openthread/Kconfig.thread
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,13 @@ config OPENTHREAD_BLE_TCAT_THREAD_STACK_SIZE
default 5120 if OPENTHREAD_CRYPTO_PSA
default 4200
help
Openthread default TCAT stack size.
Openthread default TCAT stack size.

config OPENTHREAD_BLE_TCAT_RING_BUF_SIZE
int "Openthread BLE ringbuffer size"
default 512
help
Openthread BLE TCAT ringbuffer size.
Openthread BLE TCAT ringbuffer size.

config OPENTHREAD_NAT64_CIDR
string "Set IPv4 CIDR used by NAT64"
Expand All @@ -204,3 +204,9 @@ config OPENTHREAD_NAT64_CIDR
to set source address of the outgoing translated IPv4 packets.
The CIDR must have four bytes in the address with the
non-zero length of prefix (e.g., "127.0.0.1/24").

config OPENTHREAD_STORE_FRAME_COUNTER_AHEAD
int "Openthread frame counter ahead value"
default 100000
help
Openthread value ahead of the current frame counter for persistent storage.
10 changes: 10 additions & 0 deletions modules/openthread/platform/openthread-core-zephyr-config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,4 +448,14 @@
#define OPENTHREAD_CONFIG_RADIO_STATS_ENABLE CONFIG_OPENTHREAD_RADIO_STATS
#endif

/**
* @def OPENTHREAD_CONFIG_STORE_FRAME_COUNTER_AHEAD
*
* The value ahead of the current frame counter for persistent storage.
*
*/
#ifdef CONFIG_OPENTHREAD_STORE_FRAME_COUNTER_AHEAD
#define OPENTHREAD_CONFIG_STORE_FRAME_COUNTER_AHEAD CONFIG_OPENTHREAD_STORE_FRAME_COUNTER_AHEAD
#endif

#endif /* OPENTHREAD_CORE_ZEPHYR_CONFIG_H_ */
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ manifest:
revision: da78aea63159771956fe0c9263f2e6985b66e9d5
path: modules/lib/open-amp
- name: openthread
revision: e10a92570f94ff1e0bc5e0da9ecf0ee135d955a6
revision: 2aeb8b833ba760ec29d5f340dd1ce7bcb61c5d56
path: modules/lib/openthread
- name: percepio
path: modules/debug/percepio
Expand Down
Loading