Skip to content

Commit d370b5b

Browse files
committed
applications: serial_lte_modem: Remove use of CONFIG_UART_x_NRF_HW_ASYNC
Use of CONFIG_UART_x_NRF_HW_ASYNC has been mostly removed earlier from SLM app side with PR nrfconnect#19720. Removing last few references. This causes some overlays to become empty so they are deleted. overlay-zephyr-modem-external-mcu.conf would only have CONFIG_SLM_POWER_PIN so it's also removed and documentation updated so that apps should define it. Signed-off-by: Tommi Rantanen <[email protected]>
1 parent db6b981 commit d370b5b

File tree

5 files changed

+4
-34
lines changed

5 files changed

+4
-34
lines changed

applications/serial_lte_modem/doc/nRF91_as_Zephyr_modem.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,9 @@ The following configuration files must be included:
4646
* :file:`overlay-zephyr-modem.conf` - To tailor SLM to how Zephyr's cellular modem driver works.
4747
This enables the :ref:`CONFIG_SLM_START_SLEEP <CONFIG_SLM_START_SLEEP>` Kconfig option, which makes the nRF91 Series SiP start only when the :ref:`power pin <CONFIG_SLM_POWER_PIN>` is toggled.
4848

49-
In addition, if the controlling chip is an external MCU, the following files must also be included:
49+
In addition, if the controlling chip is an external MCU, the following configurations must also be included:
5050

51-
* :file:`overlay-zephyr-modem-external-mcu.conf`- To define the power pin.
52-
Make sure to update the defined pin so that it matches your setup.
51+
* :kconfig:option:`CONFIG_SLM_POWER_PIN` Kconfig option - To define the power pin so that it matches your setup.
5352
* :file:`overlay-external-mcu.overlay` - To configure which UART SLM will use.
5453
The actual configuration of the UART is defined in the :file:`*_ns.overlay` overlay file matching your board in the :file:`boards` directory.
5554
Make sure to update the UART configuration (pins, baud rate) so that it matches your setup.

applications/serial_lte_modem/doc/slm_description.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,9 +328,6 @@ The following configuration files are provided:
328328
This disables most of the IP-based protocols available through AT commands (such as FTP and MQTT) as it is expected that the controlling chip's own IP stack is used instead.
329329
See :ref:`CONFIG_SLM_PPP <CONFIG_SLM_PPP>` and :ref:`SLM_AT_PPP` for more information.
330330

331-
* :file:`overlay-ppp-without-cmux.conf` - Kconfig fragment that configures the UART to be used by PPP.
332-
This configuration file should be included when building SLM with PPP and without CMUX.
333-
334331
* :file:`overlay-ppp-without-cmux.overlay` - Devicetree overlay that configures the UART to be used by PPP.
335332
This configuration file should be included when building SLM with PPP and without CMUX, in addition to :file:`overlay-ppp.conf`.
336333
It can be customized to fit your configuration (UART, baud rate, and so on).
@@ -339,7 +336,8 @@ The following configuration files are provided:
339336
* :file:`overlay-memfault.conf` - Configuration file that enables `Memfault`_.
340337
For more information about Memfault features in |NCS|, see :ref:`mod_memfault`.
341338

342-
* :file:`overlay-zephyr-modem.conf`, :file:`overlay-zephyr-modem-external-mcu.conf`, :file:`overlay-zephyr-modem-nrf9160dk-nrf52840.conf`, :file:`overlay-external-mcu.overlay`, and :file:`overlay-zephyr-modem-nrf9160dk-nrf52840.overlay` - These configuration files are used when compiling SLM to turn an nRF91 Series SiP into a Zephyr-compatible standalone modem.
339+
* :file:`overlay-zephyr-modem.conf`, :file:`overlay-zephyr-modem-nrf9160dk-nrf52840.conf`, :file:`overlay-external-mcu.overlay`, and :file:`overlay-zephyr-modem-nrf9160dk-nrf52840.overlay` - These configuration files are used when compiling SLM to turn an nRF91 Series SiP into a Zephyr-compatible standalone modem.
340+
Also set :kconfig:option:`CONFIG_SLM_POWER_PIN` Kconfig option.
343341
See :ref:`slm_as_zephyr_modem` for more information.
344342

345343
* :file:`boards/nrf9160dk_nrf9160_ns.conf` - Configuration file specific for the nRF9160 DK.

applications/serial_lte_modem/overlay-ppp-without-cmux.conf

Lines changed: 0 additions & 11 deletions
This file was deleted.

applications/serial_lte_modem/overlay-zephyr-modem-external-mcu.conf

Lines changed: 0 additions & 12 deletions
This file was deleted.

applications/serial_lte_modem/overlay-zephyr-modem-nrf9160dk-nrf52840.conf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,5 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66

7-
# Ensure that HW RX byte counting is enabled. This especially matters at higher baud rates.
8-
CONFIG_UART_1_NRF_HW_ASYNC=y
9-
CONFIG_UART_1_NRF_HW_ASYNC_TIMER=2
10-
117
# nRF52 <=> nRF91 interface pin 4 (see https://docs.nordicsemi.com/bundle/ug_nrf91_dk/page/UG/nrf91_DK/board_controller.html)
128
CONFIG_SLM_POWER_PIN=22

0 commit comments

Comments
 (0)