Skip to content

Commit 67b1690

Browse files
authored
Merge branch 'v4.0.99-ncs1-branch' into backport-2743-to-v4.0.99-ncs1-branch
2 parents 840c179 + 288fcb5 commit 67b1690

File tree

39 files changed

+158
-348
lines changed

39 files changed

+158
-348
lines changed

.github/workflows/manifest-PR.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
pull_request_target:
44
types: [opened, synchronize, closed]
55
branches:
6-
- main
6+
- v4.0.99-ncs1-branch
77

88

99
jobs:
@@ -15,3 +15,4 @@ jobs:
1515
with:
1616
token: ${{ secrets.NCS_GITHUB_TOKEN }}
1717
manifest-pr-title-details: ${{ github.event.pull_request.title }}
18+
base-branch: v3.0-branch

boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_ns.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ supported:
1616
- watchdog
1717
- usb_device
1818
vendor: nordic
19+
sysbuild: true

boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ toolchain:
99
- gnuarmemb
1010
- xtools
1111
- zephyr
12-
sysbuild: true
1312
ram: 256
1413
flash: 1524
1514
supported:
@@ -21,3 +20,5 @@ supported:
2120
- watchdog
2221
- adc
2322
- i2s
23+
vendor: nordic
24+
sysbuild: true

boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,11 @@
134134
status = "okay";
135135
};
136136

137+
&lfxo {
138+
load-capacitors = "internal";
139+
load-capacitance-picofarad = <7>;
140+
};
141+
137142
&adc {
138143
status = "okay";
139144
};

boards/nordic/nrf9131ek/nrf9131ek_nrf9131_ns.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ supported:
1313
- pwm
1414
- watchdog
1515
- netif:modem
16+
vendor: nordic
17+
sysbuild: true

boards/nordic/nrf9151dk/nrf9151dk_nrf9151_ns.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ supported:
1818
- watchdog
1919
- netif:modem
2020
vendor: nordic
21+
sysbuild: true

boards/nordic/nrf9161dk/nrf9161dk_nrf9161_ns_0_7_0.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ supported:
1818
- watchdog
1919
- netif:modem
2020
vendor: nordic
21+
sysbuild: true

boards/nordic/nrf9161dk/nrf9161dk_nrf9161_ns_0_9_0.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ supported:
1818
- watchdog
1919
- netif:modem
2020
vendor: nordic
21+
sysbuild: true

boards/nordic/thingy53/thingy53_nrf5340_cpuapp_ns.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ supported:
1616
- usb_device
1717
- netif:openthread
1818
vendor: nordic
19+
sysbuild: true

doc/connectivity/networking/api/wifi.rst

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,31 +42,16 @@ Test certificates in PEM format are committed to the repo at :zephyr_file:`sampl
4242
build process the certificates are converted to a C header file that is included by the Wi-Fi shell
4343
module.
4444

45-
If you want to use your own certificates, you can replace the existing certificates with your own certificates in the same directory.
46-
4745
.. code-block:: bash
4846
49-
$ export WIFI_TEST_CERTS_DIR=samples/net/wifi/test_certs/rsa3k
50-
$ cp client.pem $WIFI_TEST_CERTS_DIR
51-
$ cp client-key.pem $WIFI_TEST_CERTS_DIR
52-
$ cp ca.pem $WIFI_TEST_CERTS_DIR
53-
$ cp client2.pem $WIFI_TEST_CERTS_DIR
54-
$ cp client-key2.pem $WIFI_TEST_CERTS_DIR
55-
$ cp ca2.pem $WIFI_TEST_CERTS_DIR
47+
$ cp client.pem samples/net/wifi/test_certs/
48+
$ cp client-key.pem samples/net/wifi/test_certs/
49+
$ cp ca.pem samples/net/wifi/test_certs/
50+
$ cp client2.pem samples/net/wifi/test_certs/
51+
$ cp client-key2.pem samples/net/wifi/test_certs/
52+
$ cp ca2.pem samples/net/wifi/test_certs/
5653
$ west build -p -b <board> samples/net/wifi -S wifi-enterprise
5754
58-
or alternatively copy ``rsa2k`` certificates by changing the ``WIFI_TEST_CERTS_DIR`` environment variable.
59-
60-
.. code-block:: bash
61-
62-
$ export WIFI_TEST_CERTS_DIR=samples/net/wifi/test_certs/rsa2k
63-
64-
or you can set the :envvar:`WIFI_TEST_CERTS_DIR` environment variable to point to the directory containing your certificates.
65-
66-
.. code-block:: bash
67-
68-
$ west build -p -b <board> samples/net/wifi -S wifi-enterprise -- -DWIFI_TEST_CERTS_DIR=<path_to_your_certificates>
69-
7055
Run time certificates
7156
---------------------
7257

@@ -77,7 +62,7 @@ To facilitate installation of the certificates, a helper script is provided in t
7762

7863
.. code-block:: bash
7964
80-
$ samples/net/wifi/test_certs/install_certs.py -p samples/net/wifi/test_certs/rsa2k
65+
$ ./scripts/utils/wifi_ent_cert_installer.py -p samples/net/wifi/test_certs/rsa2k
8166
8267
The script will install the certificates in the ``rsa2k`` directory to the TLS credentials store in the device over UART and using TLS credentials shell commands.
8368

0 commit comments

Comments
 (0)