Skip to content

Commit 7c03e71

Browse files
divipillairlubos
authored andcommitted
doc: fixes to Zephyr board names after the upmerge changes
Fixes on board names after the upmerge changes. Signed-off-by: divya pillai <[email protected]>
1 parent 19066dc commit 7c03e71

File tree

13 files changed

+127
-126
lines changed

13 files changed

+127
-126
lines changed

applications/nrf_desktop/board_configuration.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Sample dongle (``nrf5340dk/nrf5340``)
107107
* The configuration with the B0 bootloader is set as default.
108108

109109
Sample mouse or keyboard (``nrf54l15dk/nrf54l05/cpuapp``)
110-
* The configuration emulates the nRF54L05 SoC on the nRF54L15 Development Kit.
110+
* The configuration :ref:`emulates the nRF54L05 SoC <zephyr:nrf54l15dk_nrf54l05>` on the nRF54L15 Development Kit.
111111
* The build types allow to build the application as a mouse or a keyboard.
112112
* Inputs are simulated based on the hardware button presses.
113113
* On the nRF54L05 SoC, you can only use the **GPIO1** port for PWM hardware peripheral output.
@@ -127,7 +127,7 @@ Sample mouse or keyboard (``nrf54l15dk/nrf54l05/cpuapp``)
127127
* The board supports the ``release`` :ref:`nrf_desktop_bluetooth_guide_fast_pair` configuration that acts as a mouse (``release_fast_pair`` file suffix).
128128

129129
Sample mouse or keyboard (``nrf54l15dk/nrf54l10/cpuapp``)
130-
* The configuration emulates the nRF54L10 SoC on the nRF54L15 Development Kit.
130+
* The configuration :ref:`emulates the nRF54L10 SoC <zephyr:nrf54l15dk_nrf54l10>` on the nRF54L15 Development Kit.
131131
* The build types allow to build the application as a mouse or a keyboard.
132132
* Inputs are simulated based on the hardware button presses.
133133
* On the nRF54L10 SoC, you can only use the **GPIO1** port for PWM hardware peripheral output.

applications/serial_lte_modem/doc/nRF91_as_Zephyr_modem.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This means that the controlling chip can run a Zephyr application that seamlessl
1515

1616
This is made possible by SLM's support of CMUX and PPP and Zephyr's cellular modem driver.
1717

18-
The nRF52840 SoC present in the :ref:`zephyr:nrf9160dk_nrf9160` can even be made to be the controlling chip with the appropriate configuration (described below).
18+
The :ref:`nRF52840 SoC present in the nRF9160 DK <zephyr:nrf9160dk_nrf52840>` can even be made to be the controlling chip with the appropriate configuration (described below).
1919
This is only possible on the nRF9160 DK, not on the other nRF91 Series DKs.
2020

2121
.. note::

doc/nrf/app_dev/board_names.rst

Lines changed: 71 additions & 71 deletions
Large diffs are not rendered by default.

doc/nrf/app_dev/device_guides/nrf52/index.rst

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ Zephyr and the |NCS| provide support and contain board definitions for developin
3131
- `Product Specification <nRF52811 Product Specification_>`_
3232
* - :zephyr:board:`nrf52833dk`
3333
- PCA10100
34-
- ``nrf52833dk/nrf52833``
35-
- | `Product Specification <nRF52833 Product Specification_>`_
36-
| `User Guide <nRF52833 DK User Guide_>`_
34+
- | ``nrf52833dk/nrf52833``
35+
| ``nrf52833dk/nrf52820``
36+
- | `nRF52833 Product Specification <nRF52833 Product Specification_>`_
37+
| `nRF52820 Product Specification <nRF52833 Product Specification_>`_
38+
| `nRF52833 User Guide <nRF52833 DK User Guide_>`_
3739
* - :zephyr:board:`nrf52833dk`
3840
- PCA10100
3941
- ``nrf52833dk/nrf52820``
@@ -43,11 +45,11 @@ Zephyr and the |NCS| provide support and contain board definitions for developin
4345
- ``nrf52dk/nrf52832``
4446
- | `Product Specification <nRF52832 Product Specification_>`_
4547
| `User Guide <nRF52 DK User Guide_>`_
46-
* - :zephyr:board:`nrf52dk`
48+
* - :ref:`zephyr:nrf52dk_nrf52810`
4749
- PCA10040
4850
- ``nrf52dk/nrf52810``
4951
- `Product Specification <nRF52810 Product Specification_>`_
50-
* - :zephyr:board:`nrf52dk`
52+
* - :ref:`zephyr:nrf52dk_nrf52805`
5153
- PCA10040
5254
- ``nrf52dk/nrf52805``
5355
- `Product Specification <nRF52805 Product Specification_>`_

doc/nrf/app_dev/device_guides/nrf54l/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ Zephyr and the |NCS| provide support and contain board definitions for developin
2626
| `User Guide <nRF54L15 DK User Guide_>`_
2727
- | `nRF54L15 DK product page <nRF54L15 DK_>`_
2828
| `nRF54L15 System-on-Chip (SoC) <nRF54L15 System-on-Chip_>`_
29-
* - nRF54L10 emulation on the nRF54L15 DK
29+
* - :ref:`nRF54L10 emulation on the nRF54L15 DK <zephyr:nrf54l15dk_nrf54l10>`
3030
- PCA10156
3131
- ``nrf54l15dk/nrf54l10/cpuapp``
3232
- | `Datasheet <nRF54L15 Datasheet_>`_
3333
- | `nRF54L10 System-on-Chip (SoC) <nRF54L10_>`_
34-
* - nRF54L05 emulation on the nRF54L15 DK
34+
* - :ref:`nRF54L05 emulation on the nRF54L15 DK <zephyr:nrf54l15dk_nrf54l05>`
3535
- PCA10156
3636
- ``nrf54l15dk/nrf54l05/cpuapp``
3737
- | `Datasheet <nRF54L15 Datasheet_>`_

doc/nrf/includes/sample_board_rows.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.. heading
22

3-
| Hardware platforms | PCA | Board name | Board target |
3+
| Hardware platforms | PCA | Board name | :ref:`Board target <app_boards>` |
44

55
.. nrf52dk_nrf52832
66

@@ -16,21 +16,21 @@
1616

1717
.. nrf9160dk_nrf9160
1818

19-
| :ref:`nRF9160 DK <ug_nrf9160>` | PCA10090 | :ref:`nrf9160dk <nrf9160dk_nrf9160>` | ``nrf9160dk/nrf9160`` |
19+
| :ref:`nRF9160 DK <ug_nrf9160>` | PCA10090 | :ref:`nrf9160dk <zephyr:nrf9160dk_nrf9160>` | ``nrf9160dk/nrf9160`` |
2020

2121
.. nrf9160dk_nrf9160_ns
2222

23-
| :ref:`nRF9160 DK <ug_nrf9160>` | PCA10090 | :ref:`nrf9160dk <nrf9160dk_nrf9160>` | ``nrf9160dk/nrf9160/ns`` |
23+
| :ref:`nRF9160 DK <ug_nrf9160>` | PCA10090 | :ref:`nrf9160dk <zephyr:nrf9160dk_nrf9160>` | ``nrf9160dk/nrf9160/ns`` |
2424

2525
.. nrf9160dk_nrf9160_and_ns
2626

27-
| :ref:`nRF9160 DK <ug_nrf9160>` | PCA10090 | :ref:`nrf9160dk <nrf9160dk_nrf9160>` | ``nrf9160dk/nrf9160`` |
27+
| :ref:`nRF9160 DK <ug_nrf9160>` | PCA10090 | :ref:`nrf9160dk <zephyr:nrf9160dk_nrf9160>` | ``nrf9160dk/nrf9160`` |
2828
| | | | |
2929
| | | | ``nrf9160dk/nrf9160/ns`` |
3030

3131
.. nrf9160dk_nrf52840
3232

33-
| :ref:`nRF9160 DK <ug_nrf9160>` | PCA10090 | :ref:`nrf9160dk <nrf9160dk_nrf9160>` | ``nrf9160dk/nrf52840`` |
33+
| :ref:`nRF9160 DK <ug_nrf9160>` | PCA10090 | :ref:`nrf9160dk <zephyr:nrf9160dk_nrf52840>` | ``nrf9160dk/nrf52840`` |
3434

3535
.. nrf9161dk_nrf9161
3636

@@ -106,19 +106,19 @@
106106

107107
.. nrf52dk_nrf52810
108108

109-
| :ref:`nRF52 DK (emulating nRF52810) <ug_nrf52>` | PCA10040 | :zephyr:board:`nrf52dk` | ``nrf52dk/nrf52810`` |
109+
| :ref:`nRF52 DK (emulating nRF52810) <ug_nrf52>` | PCA10040 | :ref:`nrf52dk <zephyr:nrf52dk_nrf52810>` | ``nrf52dk/nrf52810`` |
110110

111111
.. nrf52dk_nrf52805
112112

113-
| :ref:`nRF52 DK (emulating nRF52805) <ug_nrf52>` | PCA10040 | :zephyr:board:`nrf52dk` | ``nrf52dk/nrf52805`` |
113+
| :ref:`nRF52 DK (emulating nRF52805) <ug_nrf52>` | PCA10040 | :ref:`nrf52dk <zephyr:nrf52dk_nrf52805>` | ``nrf52dk/nrf52805`` |
114114

115115
.. nrf52kbd_nrf52832
116116

117117
| nRF52832 Desktop Keyboard | PCA20037 | nrf52kbd | ``nrf52kbd/nrf52832`` |
118118

119119
.. nrf52840dk_nrf52811
120120

121-
| :ref:`nRF52840 DK (emulating nRF52811) <ug_nrf52>` | PCA10056 | :zephyr:board:`nrf52840dk` | ``nrf52840dk/nrf52811`` |
121+
| :ref:`nRF52840 DK (emulating nRF52811) <ug_nrf52>` | PCA10056 | :ref:`nrf52840dk <zephyr:nrf52840dk_nrf52811>` | ``nrf52840dk/nrf52811`` |
122122

123123
.. nrf52840gmouse_nrf52840
124124

doc/nrf/libraries/gazell/gzp.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Overview
1616
Gazell Pairing determines the channel set used by Gazell.
1717
See the :ref:`ug_gzp` user guide for more information, such as the features of this library.
1818

19-
This library is used in the :ref:`gzp_dynamic_pairing_host` and :ref:`gzp_dynamic_pairing_device` samples.'
19+
This library is used in the :ref:`gzp_dynamic_pairing_host` and :ref:`gzp_dynamic_pairing_device` samples.
2020

2121
Requirements
2222
************

doc/nrf/protocols/matter/getting_started/hw_requirements.rst

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Values are provided in kilobytes (KB).
6060

6161
.. tab:: nRF52840 DK
6262

63-
The following table lists memory requirements for samples running on the :zephyr:board:`nrf52840dk`).
63+
The following table lists memory requirements for samples running on the :zephyr:board:`nrf52840dk`.
6464

6565
+------------------------------------------------------------------+---------------+-------------------+----------------+------------+-------------+---------------------------------+
6666
| Sample | MCUboot ROM | Application ROM | Factory data | Settings | Total ROM | Total RAM (incl. static HEAP) |
@@ -99,7 +99,7 @@ Values are provided in kilobytes (KB).
9999

100100
.. tab:: nRF5340 DK
101101

102-
The following table lists memory requirements for samples running on the :zephyr:board:`nrf5340dk`).
102+
The following table lists memory requirements for samples running on the :zephyr:board:`nrf5340dk`.
103103

104104
+------------------------------------------------------------------+---------------+-------------------+----------------+------------+-------------+---------------------------------+
105105
| Sample | MCUboot ROM | Application ROM | Factory data | Settings | Total ROM | Total RAM (incl. static HEAP) |
@@ -142,7 +142,7 @@ Values are provided in kilobytes (KB).
142142

143143
.. tab:: Thingy:53
144144

145-
The following table lists memory requirements for samples running on the :ref:`Thingy:53 <programming_board_names>` (:zephyr:board:`thingy53`).
145+
The following table lists memory requirements for samples running on the :zephyr:board:`thingy53`.
146146

147147
+---------------------------------------------------------------+---------------+-------------------+----------------+------------+-------------+---------------------------------+
148148
| Sample | MCUboot ROM | Application ROM | Factory data | Settings | Total ROM | Total RAM (incl. static HEAP) |
@@ -154,7 +154,7 @@ Values are provided in kilobytes (KB).
154154

155155
.. tab:: nRF7002 DK
156156

157-
The following table lists memory requirements for samples running on the :zephyr:board:`nrf7002dk`).
157+
The following table lists memory requirements for samples running on the :zephyr:board:`nrf7002dk`.
158158

159159
+------------------------------------------------------------+---------------+-------------------+----------------+------------+-------------+---------------------------------+
160160
| Sample | MCUboot ROM | Application ROM | Factory data | Settings | Total ROM | Total RAM (incl. static HEAP) |
@@ -189,7 +189,7 @@ Values are provided in kilobytes (KB).
189189

190190
.. tab:: nRF54L15 DK
191191

192-
The following table lists memory requirements for samples running on the :zephyr:board:`nrf54l15dk`).
192+
The following table lists memory requirements for samples running on the :zephyr:board:`nrf54l15dk`.
193193

194194
+--------------------------------------------------------------------+---------------+-------------------+----------------+------------+-------------+---------------------------------+
195195
| Sample | MCUboot ROM | Application ROM | Factory data | Settings | Total ROM | Total RAM (incl. static HEAP) |
@@ -230,7 +230,7 @@ Values are provided in kilobytes (KB).
230230

231231
.. tab:: nRF54L15 DK with TF-M
232232

233-
The following table lists memory requirements for samples running on the :zephyr:board:`nrf54l15dk`).
233+
The following table lists memory requirements for samples running on the :zephyr:board:`nrf54l15dk`.
234234

235235
+----------------------------------------------------------------+---------------+------------+-------------------+----------------+------------+----------------+-------------+---------------------------------+
236236
| Sample | MCUboot ROM | TF-M ROM | Application ROM | Factory data | Settings | TF-M Storage | Total ROM | Total RAM (incl. static HEAP) |
@@ -253,7 +253,6 @@ Values are provided in kilobytes (KB).
253253
.. note::
254254
The ``release`` configurations are built with Link-Time Optimization (LTO).
255255

256-
257256
.. _ug_matter_hw_requirements_layouts:
258257

259258
Reference Matter memory layouts
@@ -270,7 +269,7 @@ For more information about configuration of memory layouts in Matter, see :ref:`
270269

271270
.. tab:: nRF52840 DK
272271

273-
The following memory map is valid for Matter applications running on the :zephyr:board:`nrf52840dk`).
272+
The following memory map is valid for Matter applications running on the :zephyr:board:`nrf52840dk`.
274273

275274
Internal flash (size: 0x100000 = 1024kB)
276275
+-----------------------------------------+---------------------+-------------------+---------------------+-----------------+-------------------+
@@ -307,7 +306,7 @@ For more information about configuration of memory layouts in Matter, see :ref:`
307306

308307
.. tab:: nRF5340 DK
309308

310-
The following memory map is valid for Matter applications running on the :zephyr:board:`nrf5340dk`).
309+
The following memory map is valid for Matter applications running on the :zephyr:board:`nrf5340dk`.
311310

312311
Application core flash (size: 0x100000 = 1024kB)
313312
+-----------------------------------------+---------------------+-------------------+---------------------+-----------------+-------------------+
@@ -381,7 +380,7 @@ For more information about configuration of memory layouts in Matter, see :ref:`
381380

382381
.. tab:: Nordic Thingy:53
383382

384-
The following memory map is valid for the :ref:`Matter weather station <matter_weather_station_app>` application running on the :ref:`Thingy:53 <programming_board_names>` (:zephyr:board:`thingy53`).
383+
The following memory map is valid for the :ref:`Matter weather station <matter_weather_station_app>` application running on the :zephyr:board:`thingy53`.
385384
The values are valid for the ``debug`` and ``release`` build types.
386385

387386
Application core flash (size: 0x100000 = 1024kB)
@@ -454,7 +453,7 @@ For more information about configuration of memory layouts in Matter, see :ref:`
454453

455454
.. tab:: Nordic Thingy:53 (factory data)
456455

457-
The following memory map is valid for the :ref:`Matter weather station <matter_weather_station_app>` application running on the :ref:`Thingy:53 <programming_board_names>` (:zephyr:board:`thingy53`).
456+
The following memory map is valid for the :ref:`Matter weather station <matter_weather_station_app>` application running on the :zephyr:board:`thingy53`.
458457
The values are valid for the ``factory_data`` build type.
459458

460459
Application core flash (size: 0x100000 = 1024kB)
@@ -529,7 +528,7 @@ For more information about configuration of memory layouts in Matter, see :ref:`
529528

530529
.. tab:: nRF7002 DK
531530

532-
The following memory map is valid for Matter applications running on the :ref:`nRF7002 DK <programming_board_names>` (:zephyr:board:`nrf7002dk`).
531+
The following memory map is valid for Matter applications running on the :zephyr:board:`nrf7002dk`.
533532

534533
Application core flash (size: 0x100000 = 1024kB)
535534
+-----------------------------------------+---------------------+-------------------+---------------------+-----------------+-------------------+
@@ -603,7 +602,7 @@ For more information about configuration of memory layouts in Matter, see :ref:`
603602

604603
.. tab:: nRF54L15 DK
605604

606-
The following memory map is valid for Matter applications running on the :zephyr:board:`nrf54l15dk`).
605+
The following memory map is valid for Matter applications running on the :zephyr:board:`nrf54l15dk`.
607606

608607
Application core flash (size: 0x17D000 = 1524kB)
609608

@@ -641,7 +640,7 @@ For more information about configuration of memory layouts in Matter, see :ref:`
641640

642641
.. tab:: nRF54L15 DK with internal memory only
643642

644-
The following memory map is valid for Matter applications running on the :zephyr:board:`nrf54l15dk`).
643+
The following memory map is valid for Matter applications running on the :zephyr:board:`nrf54l15dk`.
645644
You can use this DK with any application.
646645
However, it is currently integrated only by the :ref:`Matter Template sample <matter_template_sample>`.
647646

@@ -676,7 +675,7 @@ For more information about configuration of memory layouts in Matter, see :ref:`
676675

677676
.. tab:: nRF54L15 DK with TF-M
678677

679-
The following table lists memory requirements for samples running on the :zephyr:board:`nrf54l15dk`).
678+
The following table lists memory requirements for samples running on the :zephyr:board:`nrf54l15dk`.
680679

681680
Application core flash (size: 0x17D000 = 1524kB)
682681

@@ -715,7 +714,7 @@ For more information about configuration of memory layouts in Matter, see :ref:`
715714

716715
.. tab:: nRF54L10 emulation on nRF54L15 DK
717716

718-
The following memory map is valid for Matter applications running on the :zephyr:board:`nrf54l15dk`).
717+
The following memory map is valid for Matter applications running on the :ref:`nRF54L15 DK (emulating nRF54L10) <zephyr:nrf54l15dk_nrf54l10>`.
719718

720719
Application core flash (size: 0xFF800 = 1022kB)
721720

@@ -770,7 +769,7 @@ The following tabs show the RAM memory layout defined for the default configurat
770769

771770
.. tab:: nRF52840 DK
772771

773-
The following RAM memory layout is valid for Matter applications running on the :zephyr:board:`nrf52840dk`).
772+
The following RAM memory layout is valid for Matter applications running on the :zephyr:board:`nrf52840dk`.
774773

775774
Base Application core SRAM size (size: 0x40000 = 256kB)
776775
SRAM is located at the address ``0x20000000`` in the memory address space of the application.
@@ -789,7 +788,7 @@ The following tabs show the RAM memory layout defined for the default configurat
789788

790789
.. tab:: nRF5340 DK
791790

792-
The following RAM memory layout is valid for Matter applications running on the :zephyr:board:`nrf5340dk`).
791+
The following RAM memory layout is valid for Matter applications running on the :zephyr:board:`nrf5340dk`.
793792

794793
Application core SRAM primary (size: 0x80000 = 512kB)
795794
SRAM is located at the address ``0x20000000`` in the memory address space of the application.
@@ -808,7 +807,7 @@ The following tabs show the RAM memory layout defined for the default configurat
808807

809808
.. tab:: nRF7002 DK
810809

811-
The following RAM memory layout is valid for Matter applications running on the :ref:`nRF7002 DK <programming_board_names>` (:zephyr:board:`nrf7002dk`).
810+
The following RAM memory layout is valid for Matter applications running on the :zephyr:board:`nrf7002dk`.
812811

813812
Application core SRAM primary (size: 0x80000 = 512kB)
814813
SRAM is located at the address ``0x20000000`` in the memory address space of the application.
@@ -827,7 +826,7 @@ The following tabs show the RAM memory layout defined for the default configurat
827826

828827
.. tab:: Nordic Thingy:53
829828

830-
The following RAM memory layout for the :ref:`Matter weather station <matter_weather_station_app>` application running on the :ref:`Thingy:53 <programming_board_names>` (:zephyr:board:`thingy53`).
829+
The following RAM memory layout for the :ref:`Matter weather station <matter_weather_station_app>` application running on the :zephyr:board:`thingy53`.
831830

832831
Application core SRAM primary (size: 0x80000 = 512kB)
833832
SRAM is located at the address ``0x20000000`` in the memory address space of the application.
@@ -846,7 +845,7 @@ The following tabs show the RAM memory layout defined for the default configurat
846845

847846
.. tab:: nRF54L15 DK
848847

849-
The following RAM memory layout is valid for Matter applications running on the :zephyr:board:`nrf54l15dk`).
848+
The following RAM memory layout is valid for Matter applications running on the :zephyr:board:`nrf54l15dk`.
850849

851850
Base SRAM size (size: 0x40000 = 256kB)
852851
SRAM is located at the address ``0x20000000`` in the memory address space of the application.

0 commit comments

Comments
 (0)