doc: requirements: nRF Util bundled with toolchain

Added nRF Util to the list of required tools bundled with the toolchain.
Updated ncs_tool_versions.py to account for the subcommand version.
Updated nRF Util section in recommended_versions.rst.
Updated install_ncs.rst prerequisites for command line.
Updated install_sdk_common_prerequisites.txt to remove mention of
nRF Util. PR #22969 and NRFU-1571.

Signed-off-by: Grzegorz Ferenc <[email protected]>

Author: greg-fer

doc/_extensions/ncs_tool_versions.py

@@ -13,7 +13,9 @@
 
 For tool-versions-{os} files:
     {TOOL_NAME}_VERSION_{OS}
+    {TOOL_NAME}_{SUBCOMMAND}_VERSION_{OS}
 where OS is one of WIN10, LINUX or DARWIN
+where SUBCOMMAND is one of nRF Util subcommands, like DEVICE, SDK-MANAGER, etc.
 
 For pip requirement files:
     {TOOL_NAME}_VERSION
@@ -22,6 +24,7 @@
 - :ncs-tool-version:`CMAKE_VERSION_LINUX`
 - :ncs-tool-version:`SPHINX_VERSION`
 - :ncs-tool-version:`SPHINX_NCS_THEME_VERSION`
+- :ncs-tool-version:`NRFUTIL_DEVICE_VERSION_LINUX`
 
 """
 
@@ -92,6 +95,13 @@ def tool_version_replace(app: Sphinx) -> Callable:
                 entry = f"{tool_upper}_VERSION_{os}"
                 versions[entry] = yaml_object[tool]["version"]
 
+                # Handle subcommands if they exist
+                if "subcommands" in yaml_object[tool]:
+                    for subcommand, subcommand_version in yaml_object[tool]["subcommands"].items():
+                        subcommand_upper = subcommand.upper()
+                        subcommand_entry = f"{tool_upper}_{subcommand_upper}_VERSION_{os}"
+                        versions[subcommand_entry] = subcommand_version
+
         elif path.suffix == ".txt":
             for line in path.read_text().strip().split("\n"):
                 tool, version = line.split("=")

doc/nrf/includes/install_sdk_common_prerequisites.txt

@@ -1,14 +1,5 @@
 * All operating systems:
 
-  * The latest version of nRF Util, a unified command-line utility for Nordic Semiconductor products.
-    Check :ref:`operating system versions that support this tool <additional_nordic_sw_tools>` and `download the executable <nRF Util Downloads_>`_.
-
-    .. note::
-        After downloading the nRF Util executable, move it to a directory that is in the system :envvar:`PATH`.
-        On macOS and Linux, the downloaded file also needs to be given execute permission by typing `chmod +x nrfutil` or by checking the checkbox in the file properties.
-
-  * In nRF Util, the latest version of the ``device`` command.
-    Check `Installing and upgrading nRF Util commands`_ for installation information.
   * The |jlink_ver| of SEGGER J-Link.
     Download it from the `J-Link Software and Documentation Pack`_ page.
     On Windows, `install it manually together with SEGGER USB Driver for J-Link <nRF Util prerequisites_>`_.

doc/nrf/installation/install_ncs.rst

@@ -58,6 +58,14 @@ Depending on your preferred development environment, install the following softw
 
       .. include:: /includes/install_sdk_common_prerequisites.txt
 
+      Additionally, just for the development in command line, you need a separate nRF Util download to install the |NCS| toolchain:
+
+      * `Download the executable <nRF Util Downloads_>`_ for the latest version of nRF Util.
+
+        .. note::
+           After downloading the nRF Util executable, move it to a directory that is in the system :envvar:`PATH`.
+           On macOS and Linux, the downloaded file also needs to be given execute permission by typing `chmod +x nrfutil` or by checking the checkbox in the file properties.
+
 .. prerequisites-include-end
 
 .. _gs_installing_toolchain:

doc/nrf/installation/recommended_versions.rst

@@ -72,7 +72,7 @@ Required tools
 
 The following table shows the tools that are required for working with |NCS| v\ |version|.
 
-The table lists the versions that are used for testing and are installed when using the :ref:`nRF Connect for VS Code extension or nRF Util <install_ncs>`.
+The table lists the versions that are used for testing and are installed with the toolchain bundle when using the :ref:`nRF Connect for VS Code extension or command line <install_ncs>`.
 Other versions might also work, but are not verified.
 
 .. _req_tools_table:
@@ -102,6 +102,10 @@ Other versions might also work, but are not verified.
            - :ncs-tool-version:`PYTHON_VERSION_WIN10`
          * - :ref:`west <ncs_west_intro>`
            - :ncs-tool-version:`WEST_VERSION_WIN10`
+         * - nRF Util
+           - :ncs-tool-version:`NRFUTIL_VERSION_WIN10`
+         * - nRF Util's `device command <Device command overview_>`_
+           - :ncs-tool-version:`NRFUTIL_DEVICE_VERSION_WIN10`
 
    .. group-tab:: Linux
 
@@ -114,7 +118,7 @@ Other versions might also work, but are not verified.
            - :ncs-tool-version:`ZEPHYR_SDK_VERSION_LINUX`
          * - CMake
            - :ncs-tool-version:`CMAKE_VERSION_LINUX`
-         * - dtc
+         * - Devicetree compiler (dtc)
            - :ncs-tool-version:`DTC_VERSION_LINUX`
          * - :ref:`Git <ncs_git_intro>`
            - :ncs-tool-version:`GIT_VERSION_LINUX`
@@ -126,6 +130,10 @@ Other versions might also work, but are not verified.
            - :ncs-tool-version:`PYTHON_VERSION_LINUX`
          * - :ref:`west <ncs_west_intro>`
            - :ncs-tool-version:`WEST_VERSION_LINUX`
+         * - nRF Util
+           - :ncs-tool-version:`NRFUTIL_VERSION_LINUX`
+         * - nRF Util's `device command <Device command overview_>`_
+           - :ncs-tool-version:`NRFUTIL_DEVICE_VERSION_LINUX`
 
       Additionally, you need to install `nrf-udev`_ rules for accessing USB ports on Nordic Semiconductor devices and programming the firmware.
 
@@ -140,7 +148,7 @@ Other versions might also work, but are not verified.
            - :ncs-tool-version:`ZEPHYR_SDK_VERSION_DARWIN`
          * - CMake
            - :ncs-tool-version:`CMAKE_VERSION_DARWIN`
-         * - dtc
+         * - Devicetree compiler (dtc)
            - :ncs-tool-version:`DTC_VERSION_DARWIN`
          * - :ref:`Git <ncs_git_intro>`
            - :ncs-tool-version:`GIT_VERSION_DARWIN`
@@ -152,6 +160,10 @@ Other versions might also work, but are not verified.
            - :ncs-tool-version:`PYTHON_VERSION_DARWIN`
          * - :ref:`west <ncs_west_intro>`
            - :ncs-tool-version:`WEST_VERSION_DARWIN`
+         * - nRF Util
+           - :ncs-tool-version:`NRFUTIL_VERSION_DARWIN`
+         * - nRF Util's `device command <Device command overview_>`_
+           - :ncs-tool-version:`NRFUTIL_DEVICE_VERSION_DARWIN`
 
 Checking tool versions
   .. toggle::
@@ -397,12 +409,15 @@ The `nRF Util development tool`_ is a unified command line utility for Nordic pr
 Its functionality is provided through installable and upgradeable commands that are served on a central package registry on the Internet.
 
 The utility follows its own release cycle and has its own `operating system requirements <nRF Util_>`_.
-Use the latest available release for development.
+The |NCS| toolchain bundle includes the nRF Util version :ncs-tool-version:`NRFUTIL_VERSION_WIN10` and the device command version :ncs-tool-version:`NRFUTIL_DEVICE_VERSION_WIN10`, as listed in :ref:`requirements_toolchain_tools`.
+
+.. note::
+
+   When you :ref:`install the nRF Connect SDK <install_ncs>`:
 
-When you :ref:`install the nRF Connect SDK <install_ncs>`, you need to install the following nRF Util commands:
+   * If you plan to work with command line, you also need to download nRF Util and install the following command in order to get the toolchain bundle:
 
-* `device command <Device command overview_>`_ - The latest version is required as the default :ref:`west runner <programming_selecting_runner>`.
-* `sdk-manager command`_ - The latest version is required for working with |NCS| toolchain packages.
-  You only need to install this command if you are working with command line in the |NCS|.
+     * `sdk-manager command`_ - The latest version is required for working with |NCS| toolchain packages.
+       See `Installing and upgrading nRF Util commands`_ for information about how to install this command.
 
-See `Installing and upgrading nRF Util commands`_ for information about how to install these commands.
+   * If you plan to work with the :ref:`nRF Connect for VS Code extension <requirements_nrfvsc>`, you do not need a separate nRF Util installation to get the toolchain bundle.

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

@@ -34,6 +34,12 @@ IDE, OS, and tool support
 =========================
 
 * Updated the required `SEGGER J-Link`_ version to v8.42.
+* Removed the separate requirement for installation of the `nRF Util's device command <Device command overview_>`_ from the :ref:`install_ncs` page under :ref:`installing_vsc`.
+  The tool and the command are now included in the |NCS| toolchain bundle.
+
+  .. note::
+
+     If you plan to work with command line, you still need to download nRF Util and install the ``sdk-manager`` command in order to get the toolchain bundle.
 
 Board support
 =============