Skip to content

Commit 7fe0c15

Browse files
authored
Merge pull request #30 from golioth/merge/template_v2.8.0
Merge/template v2.8.0
2 parents 4645c32 + 0b668b0 commit 7fe0c15

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

socs/nrf9151_ns.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
2828
# Disable options y-selected by NCS for no good reason
2929
CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED=n
3030
CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=n
31+
CONFIG_MBEDTLS_PK_PARSE_EC_EXTENDED=n
3132

3233
# MbedTLS configuration to support p-384 curve. These options
3334
# enable using the MbedTLS built-in support for operations not

socs/nrf9160_ns.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
2828
# Disable options y-selected by NCS for no good reason
2929
CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED=n
3030
CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=n
31+
CONFIG_MBEDTLS_PK_PARSE_EC_EXTENDED=n
3132

3233
# MbedTLS configuration to support p-384 curve. These options
3334
# enable using the MbedTLS built-in support for operations not

west.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ manifest:
1010
projects:
1111
- name: golioth
1212
path: modules/lib/golioth-firmware-sdk
13-
revision: v0.18.1
13+
revision: v0.21.0
1414
url: https://github.com/golioth/golioth-firmware-sdk.git
1515
west-commands: scripts/west-commands.yml
1616
submodules: true
@@ -22,7 +22,7 @@ manifest:
2222
- zephyr
2323
- bme68x
2424
- bsec
25-
- cmsis
25+
- cmsis_6
2626
- hal_nordic
2727
- mbedtls
2828
- mbedtls-nrf
@@ -39,7 +39,7 @@ manifest:
3939

4040
- name: golioth-zephyr-boards
4141
path: deps/modules/lib/golioth-boards
42-
revision: v2.0.1
42+
revision: v2.1.1
4343
url: https://github.com/golioth/golioth-zephyr-boards
4444

4545
- name: zephyr-network-info
@@ -49,7 +49,7 @@ manifest:
4949

5050
- name: golioth-battery-monitor
5151
path: deps/modules/lib/battery-monitor
52-
revision: v1.0.0
52+
revision: v1.1.0
5353
url: https://github.com/golioth/battery-monitor
5454

5555
self:

0 commit comments

Comments
 (0)