Skip to content

Commit 3559a89

Browse files
committed
samples: nrf9160: modem_shell: Align with upstream console changes
Configure console/shell with Device Tree instead of Kconfig. Add extra step for the CI to build the PPP configuration. Signed-off-by: Robert Lubos <[email protected]>
1 parent 06b55c4 commit 3559a89

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

samples/nrf9160/modem_shell/overlay-ppp.conf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ CONFIG_MOSH_SMS=n
1818
CONFIG_SMS=n
1919

2020
# UARTs are switched
21-
CONFIG_UART_SHELL_ON_DEV_NAME="UART_1"
22-
CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_1"
23-
2421
CONFIG_NET_PPP_UART_NAME="UART_0"
2522

2623
# Enable net shell commands
@@ -48,6 +45,7 @@ CONFIG_NET_IP_ADDR_CHECK=n
4845
CONFIG_NET_DEFAULT_IF_PPP=y
4946

5047
# UART PPP driver
48+
CONFIG_NET_DRIVERS=y
5149
CONFIG_NET_PPP=y
5250
#CONFIG_NET_PPP_RX_PRIORITY=15
5351
CONFIG_NET_PPP_DRV_NAME="ppp"

samples/nrf9160/modem_shell/boards/nrf9160dk_nrf9160_ns.overlay renamed to samples/nrf9160/modem_shell/ppp.overlay

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,10 @@
1010
&uart1 {
1111
status = "okay";
1212
};
13+
14+
/ {
15+
chosen {
16+
zephyr,console = &uart1;
17+
zephyr,shell-uart = &uart1;
18+
};
19+
};

samples/nrf9160/modem_shell/sample.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,11 @@ tests:
77
integration_platforms:
88
- nrf9160dk_nrf9160_ns
99
tags: ci_build
10+
samples.nrf9160.modem_shell.ppp:
11+
build_only: true
12+
platform_allow: nrf9160dk_nrf9160_ns
13+
integration_platforms:
14+
- nrf9160dk_nrf9160_ns
15+
extra_args: OVERLAY_CONFIG=overlay-ppp.conf
16+
DTC_OVERLAY_FILE="ppp.overlay"
17+
tags: ci_build

0 commit comments

Comments
 (0)