Skip to content

Commit de6d1a5

Browse files
greg-fernordicjm
authored andcommitted
doc: cmake: change ref link to build system
Changed the link pointing incorrectly to Zephyr's build system vars so that it points to the nRF Connect SDK's build system overview. Aligned formatting of EXTRA_CONF_FILE and _FILE variables (:makevar:). NCSDK-27178. Signed-off-by: Grzegorz Ferenc <[email protected]>
1 parent fd0f5e8 commit de6d1a5

File tree

13 files changed

+26
-29
lines changed

13 files changed

+26
-29
lines changed

applications/serial_lte_modem/doc/slm_description.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ See :ref:`app_build_system`: for more information on the |NCS| configuration sys
294294

295295
.. important::
296296

297-
When adding Kconfig fragments and devicetree overlays, make sure to use the ``-DEXTRA_CONF_FILE`` and ``-DEXTRA_DTC_OVERLAY_FILE`` CMake parameters, respectively.
298-
Otherwise, if ``-DCONF_FILE`` or ``-DDTC_OVERLAY_FILE`` is used, all the configuration files that normally get picked up automatically will have to be included explicitly.
297+
When adding Kconfig fragments and devicetree overlays, make sure to use the :makevar:`EXTRA_CONF_FILE` and :makevar:`EXTRA_DTC_OVERLAY_FILE` :ref:`CMake options <cmake_options>`, respectively.
298+
Otherwise, if :makevar:`CONF_FILE` or :makevar:`DTC_OVERLAY_FILE` is used, all the configuration files that normally get picked up automatically will have to be included explicitly.
299299

300300
The following configuration files are provided:
301301

doc/nrf/protocols/wifi/stack_configuration.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,5 +294,4 @@ The nRF Wi-Fi driver can be used in the following profiles (not an exhaustive li
294294
The measured throughputs, as shown in the table above, are based on tests conducted using the nRF7002 DK.
295295
The results represent the best throughput, averaged over three iterations, and were obtained with a good RSSI signal in a clean environment.
296296

297-
The above configuration values can be passed using standard ways such as CMake arguments to west build (`Zephyr One Time Arguments`_ or `Zephyr Permanent Arguments`_), or by adding them in an :file:`overlay` file and passing to west build as CMake argument ``EXTRA_CONF_FILE``.
298-
See `Zephyr Application Configuration`_ for more details.
297+
The above configuration values can be passed when :ref:`configuring Kconfig options <configuring_kconfig>` before a build or by adding them in an :file:`overlay` file and passing to west build as CMake argument :makevar:`EXTRA_CONF_FILE` using the respective :ref:`CMake option <cmake_options>`.

doc/nrf/releases_and_maturity/migration/migration_sysbuild.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ Without doing this, projects with multiple images (for example, those with MCUbo
560560
| ``-D<image>_SHIELD=...`` | Applies only to <image> |Applies only to <image>|
561561
+-------------------------------+----------------------------------+-----------------------+
562562

563-
Configuration values that specify Kconfig fragment or overlay files (for example, ``EXTRA_CONF_FILE`` and ``EXTRA_DTC_OVERLAY_FILE``) cannot be applied globally using either child/parent image or sysbuild.
563+
Configuration values that specify Kconfig fragment or overlay files (for example, :makevar:`EXTRA_CONF_FILE` and :makevar:`EXTRA_DTC_OVERLAY_FILE`) cannot be applied globally using either child/parent image or sysbuild.
564564
They function the same in both systems:
565565

566566
* Without a prefix, they will be applied to the main application only.

samples/bluetooth/direction_finding_central/README.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,9 @@ The following additional configuration files are available for the :ref:`nRF5340
7272
Angle of departure mode
7373
=======================
7474

75-
To build this sample with AoD mode only, set ``EXTRA_CONF_FILE`` to the :file:`overlay-aod.conf` file.
75+
To build this sample with AoD mode only, set :makevar:`EXTRA_CONF_FILE` to the :file:`overlay-aod.conf` file using the respective :ref:`CMake option <cmake_options>`.
7676

77-
See :ref:`cmake_options` for instructions on how to add this option.
78-
For more information about using configuration overlay files, see :ref:`zephyr:important-build-vars` in the Zephyr documentation.
77+
For more information about configuration files in the |NCS|, see :ref:`app_build_system`.
7978

8079
To build this sample for :ref:`nRF5340 DK <ug_nrf5340>`, with AoD mode only, add content of :file:`overlay-aod.conf` file to :file:`child_image/hci_ipc.conf` file.
8180

samples/bluetooth/direction_finding_connectionless_tx/README.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,9 @@ Configuration
4848
Angle of arrival mode
4949
=====================
5050

51-
To build this sample with AoA mode only, set ``EXTRA_CONF_FILE`` to the :file:`overlay-aoa.conf` file.
51+
To build this sample with AoA mode only, set :makevar:`EXTRA_CONF_FILE` to the :file:`overlay-aoa.conf` file using the respective :ref:`CMake option <cmake_options>`.
5252

53-
See :ref:`cmake_options` for instructions on how to add this option.
54-
For more information about using configuration overlay files, see :ref:`zephyr:important-build-vars` in the Zephyr documentation.
53+
For more information about configuration files in the |NCS|, see :ref:`app_build_system`.
5554

5655
To build this sample for :ref:`nRF5340 DK <ug_nrf5340>`, with AoA mode only, add content of :file:`overlay-aoa.conf` file to :file:`child_image/hci_ipc.conf` file.
5756

samples/bluetooth/mesh/light/README.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,7 @@ DFU configuration
163163
Currently, the nRF5340 development kit only supports DFU for the application core.
164164
This implies that all application DFU images must be compatible with the network core image running on the device.
165165

166-
For more information about using configuration overlay files, see :ref:`zephyr:important-build-vars` in the Zephyr documentation.
167-
For more information about selecting a sysbuild configuration file, see the sysbuild Kconfig file section on the :ref:`zephyr:sysbuild` page in the Zephyr documentation.
166+
For more information about configuration files in the |NCS|, see :ref:`app_build_system`.
168167

169168
FEM support
170169
===========

samples/bluetooth/mesh/light_ctrl/README.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,12 @@ FEM support
190190
Emergency data storage
191191
======================
192192

193-
To build this sample with support for emergency data storage (EMDS), set ``EXTRA_CONF_FILE`` to :file:`overlay-emds.conf`.
193+
To build this sample with support for emergency data storage (EMDS), set :makevar:`EXTRA_CONF_FILE` to :file:`overlay-emds.conf` using the respective :ref:`CMake option <cmake_options>`.
194194
This will save replay protection list (RPL) data and some of the :ref:`bt_mesh_lightness_srv_readme` data to the emergency data storage instead of to the :ref:`settings_api`.
195195
When using EMDS, certain considerations need to be taken regarding hardware choices in your application design.
196196
See :ref:`emds_readme_application_integration` in the EMDS documentation for more information.
197197

198-
See :ref:`cmake_options` for instructions on how to add this option.
199-
For more information about using configuration overlay files, see :ref:`zephyr:important-build-vars` in the Zephyr documentation.
198+
For more information about configuration files in the |NCS|, see :ref:`app_build_system`.
200199

201200
Building and running
202201
********************

samples/bluetooth/mesh/light_switch/README.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ The light switch sample is split into the following source files:
228228
LPN configuration
229229
=================
230230

231-
To make the light switch run as an LPN, set :makevar:`EXTRA_CONF_FILE` to :file:`overlay-lpn.conf` when building the sample.
231+
To make the light switch run as an LPN, set :makevar:`EXTRA_CONF_FILE` to :file:`overlay-lpn.conf` when building the sample using the respective :ref:`CMake option <cmake_options>`.
232232
For example, when building from the command line, use the following command, where *board_target* is the target for the development kit for which you are building:
233233

234234
.. parsed-literal::
@@ -238,7 +238,8 @@ For example, when building from the command line, use the following command, whe
238238
239239
The configuration overlay :file:`overlay-lpn.conf` enables the LPN feature, and alters certain configuration options to further lower the power consumption.
240240
To review the specific alterations, open and inspect the :file:`overlay-lpn.conf` file.
241-
For more information about using configuration overlay files, see :ref:`zephyr:important-build-vars` in the Zephyr documentation.
241+
242+
For more information about configuration files in the |NCS|, see :ref:`app_build_system`.
242243

243244
FEM support
244245
===========

samples/bluetooth/peripheral_uart/README.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,16 +192,15 @@ To build the sample with a :ref:`ble_rpc` interface, use the following command:
192192
Activating sample extensions
193193
============================
194194

195-
To activate the optional extensions supported by this sample, modify :makevar:`EXTRA_CONF_FILE` in the following manner:
195+
To activate the optional extensions supported by this sample, set :makevar:`EXTRA_CONF_FILE` using the respective :ref:`CMake option <cmake_options>` in the following manner:
196196

197-
* For the minimal build variant, set :file:`prj_minimal.conf`.
198-
* For the USB CDC ACM extension, set :file:`prj_cdc.conf`.
197+
* For the minimal build variant, set it to :file:`prj_minimal.conf`.
198+
* For the USB CDC ACM extension, set it to :file:`prj_cdc.conf`.
199199
Additionally, you need to set :makevar:`DTC_OVERLAY_FILE` to the :file:`usb.overlay` file.
200-
* For the MCUboot with serial recovery of the networking core image feature, set the :file:`nrf5340dk_app_sr_net.conf` file.
200+
* For the MCUboot with serial recovery of the networking core image feature, set it to :file:`nrf5340dk_app_sr_net.conf`.
201201
You also need to set the :makevar:`mcuboot_EXTRA_CONF_FILE` variant to the :file:`nrf5340dk_mcuboot_sr_net.conf` file.
202202

203-
See :ref:`cmake_options` for instructions on how to add this option.
204-
For more information about using configuration overlay files, see :ref:`zephyr:important-build-vars` in the Zephyr documentation.
203+
For more information about configuration files in the |NCS|, see :ref:`app_build_system`.
205204

206205
.. _peripheral_uart_testing:
207206

samples/cellular/lwm2m_carrier/sample_description.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Building and running
120120
Building with overlay
121121
=====================
122122

123-
To build with a Kconfig overlay, pass it to the build system using the ``EXTRA_CONF_FILE`` CMake variable, as shown in the following example:
123+
To build with a Kconfig overlay, set :makevar:`EXTRA_CONF_FILE` to the :file:`overlay-shell.conf` file using the respective :ref:`CMake option <cmake_options>`, as shown in the following example:
124124

125125
.. parsed-literal::
126126
:class: highlight
@@ -132,6 +132,8 @@ To build with a Kconfig overlay, pass it to the build system using the ``EXTRA_C
132132
This command builds for your nRF91 Series DK using the configurations found in the :file:`overlay-shell.conf` file, in addition to the configurations found in the :file:`prj.conf` file.
133133
If some options are defined in both files, the options set in the overlay take precedence.
134134

135+
For more information about configuration files in the |NCS|, see :ref:`app_build_system`.
136+
135137
Testing
136138
=======
137139

0 commit comments

Comments
 (0)