Skip to content

Commit 9d657e8

Browse files
committed
tests: tfm: add nrf7120 ns tests
add ns board test for crypto samples and tests tfm, nrf7120 uses uart20 for non-secure application printing. Signed-off-by: Travis Lam <[email protected]>
1 parent 7e887cc commit 9d657e8

File tree

33 files changed

+143
-21
lines changed

33 files changed

+143
-21
lines changed

boards/nordic/nrf7120pdk/nrf7120_cpuapp_common.dtsi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
/ {
1313
chosen {
14-
zephyr,console = &uart30;
15-
zephyr,shell-uart = &uart30;
16-
zephyr,uart-mcumgr = &uart30;
17-
zephyr,bt-mon-uart = &uart30;
18-
zephyr,bt-c2h-uart = &uart30;
14+
zephyr,console = &uart20;
15+
zephyr,shell-uart = &uart20;
16+
zephyr,uart-mcumgr = &uart20;
17+
zephyr,bt-mon-uart = &uart20;
18+
zephyr,bt-c2h-uart = &uart20;
1919
zephyr,flash = &cpuapp_mram;
2020
zephyr,ieee802154 = &ieee802154;
2121
zephyr,wifi = &wlan0;
@@ -120,7 +120,7 @@
120120
};
121121
};
122122

123-
&uart30 {
123+
&uart20 {
124124
status = "okay";
125125
};
126126

boards/nordic/nrf7120pdk/nrf7120pdk_nrf7120-pinctrl.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
group1 {
4545
psels = <NRF_PSEL(UART_TX, 0, 5)>,
4646
<NRF_PSEL(UART_RX, 0, 6)>,
47-
<NRF_PSEL(UART_RTS, 0, 2)>,
48-
<NRF_PSEL(UART_CTS, 0, 3)>;
47+
<NRF_PSEL(UART_RTS, 0, 8)>,
48+
<NRF_PSEL(UART_CTS, 0, 7)>;
4949
low-power-enable;
5050
};
5151
};

doc/nrf/includes/sample_board_rows.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,3 +302,7 @@
302302
.. nrf7120pdk_nrf7120_cpuapp
303303

304304
| nRF7120 PDK | | nrf7120pdk | ``nrf7120pdk/nrf7120/cpuapp`` |
305+
306+
.. nrf7120pdk_nrf7120_cpuapp_ns
307+
308+
| nRF7120 PDK | | nrf7120pdk | ``nrf7120pdk/nrf7120/cpuapp/ns`` |

modules/trusted-firmware-m/tfm_boards/board/RTE_Device.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,9 @@
3232
#define RTE_USART0 1
3333

3434
#elif defined(CONFIG_SOC_SERIES_NRF54LX) || defined(CONFIG_SOC_SERIES_NRF71X)
35-
36-
/* UART20 and UART30 are supported for TF-M tests on NRF54LX,
37-
* while UART00 and UART30 are supported on NRF71X
38-
*/
39-
#if defined(CONFIG_SOC_SERIES_NRF54LX) && defined(CONFIG_TFM_SECURE_UART30)
35+
/* UART20 and UART30 are supported for TF-M tests on NRF54LX and NRF71X. */
36+
#if defined(CONFIG_TFM_SECURE_UART30)
4037
#define RTE_USART20 1
41-
#elif defined(CONFIG_SOC_SERIES_NRF71X) && defined(CONFIG_TFM_SECURE_UART30)
42-
#define RTE_USART00 1
4338
#else
4439
#define RTE_USART30 1
4540
#endif

samples/crypto/aes_cbc/sample.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ tests:
5555
- nrf54lv10dk/nrf54lv10a/cpuapp/ns
5656
- [email protected]/nrf54lv10a/cpuapp
5757
- nrf7120pdk/nrf7120/cpuapp
58+
- nrf7120pdk/nrf7120/cpuapp/ns
5859
harness: console
5960
harness_config:
6061
type: multi_line
@@ -70,3 +71,4 @@ tests:
7071
- nrf54lv10dk/nrf54lv10a/cpuapp
7172
- nrf54lv10dk/nrf54lv10a/cpuapp/ns
7273
- nrf7120pdk/nrf7120/cpuapp
74+
- nrf7120pdk/nrf7120/cpuapp/ns

samples/crypto/aes_ccm/sample.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ tests:
5757
- nrf54lv10dk/nrf54lv10a/cpuapp/ns
5858
- [email protected]/nrf54lv10a/cpuapp
5959
- nrf7120pdk/nrf7120/cpuapp
60+
- nrf7120pdk/nrf7120/cpuapp/ns
6061
harness: console
6162
harness_config:
6263
type: multi_line
@@ -74,3 +75,4 @@ tests:
7475
- nrf54lv10dk/nrf54lv10a/cpuapp
7576
- nrf54lv10dk/nrf54lv10a/cpuapp/ns
7677
- nrf7120pdk/nrf7120/cpuapp
78+
- nrf7120pdk/nrf7120/cpuapp/ns

samples/crypto/aes_ctr/sample.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ tests:
5555
- nrf54lv10dk/nrf54lv10a/cpuapp/ns
5656
- [email protected]/nrf54lv10a/cpuapp
5757
- nrf7120pdk/nrf7120/cpuapp
58+
- nrf7120pdk/nrf7120/cpuapp/ns
5859
harness: console
5960
harness_config:
6061
type: multi_line
@@ -70,3 +71,4 @@ tests:
7071
- nrf54lv10dk/nrf54lv10a/cpuapp
7172
- nrf54lv10dk/nrf54lv10a/cpuapp/ns
7273
- nrf7120pdk/nrf7120/cpuapp
74+
- nrf7120pdk/nrf7120/cpuapp/ns

samples/crypto/aes_gcm/sample.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ tests:
7777
- nrf54lv10dk/nrf54lv10a/cpuapp/ns
7878
- [email protected]/nrf54lv10a/cpuapp
7979
- nrf7120pdk/nrf7120/cpuapp
80+
- nrf7120pdk/nrf7120/cpuapp/ns
8081
harness: console
8182
harness_config:
8283
type: multi_line
@@ -94,6 +95,7 @@ tests:
9495
- nrf54lv10dk/nrf54lv10a/cpuapp
9596
- nrf54lv10dk/nrf54lv10a/cpuapp/ns
9697
- nrf7120pdk/nrf7120/cpuapp
98+
- nrf7120pdk/nrf7120/cpuapp/ns
9799
sample.aes_gcm.cracen.crypto_service:
98100
sysbuild: true
99101
tags:

samples/crypto/chachapoly/sample.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ tests:
5858
- nrf54lv10dk/nrf54lv10a/cpuapp/ns
5959
- [email protected]/nrf54lv10a/cpuapp
6060
- nrf7120pdk/nrf7120/cpuapp
61+
- nrf7120pdk/nrf7120/cpuapp/ns
6162
harness: console
6263
harness_config:
6364
type: multi_line
@@ -75,3 +76,4 @@ tests:
7576
- nrf54lv10dk/nrf54lv10a/cpuapp
7677
- nrf54lv10dk/nrf54lv10a/cpuapp/ns
7778
- nrf7120pdk/nrf7120/cpuapp
79+
- nrf7120pdk/nrf7120/cpuapp/ns

samples/crypto/ecdh/sample.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ tests:
5757
- nrf54lv10dk/nrf54lv10a/cpuapp/ns
5858
- [email protected]/nrf54lv10a/cpuapp
5959
- nrf7120pdk/nrf7120/cpuapp
60+
- nrf7120pdk/nrf7120/cpuapp/ns
6061
harness: console
6162
harness_config:
6263
type: multi_line
@@ -74,6 +75,7 @@ tests:
7475
- nrf54lv10dk/nrf54lv10a/cpuapp
7576
- nrf54lv10dk/nrf54lv10a/cpuapp/ns
7677
- nrf7120pdk/nrf7120/cpuapp
78+
- nrf7120pdk/nrf7120/cpuapp/ns
7779
sample.ecdh.cracen.crypto_service:
7880
sysbuild: true
7981
tags:

0 commit comments

Comments
 (0)