From 18c27de5eb3d43ef4583210fe69d50b8b657abf6 Mon Sep 17 00:00:00 2001 From: Marcin Jelinski Date: Tue, 18 Jul 2023 13:48:22 +0200 Subject: [PATCH] boards: Align the nRF21540 EK names with the new convention According to the new naming convention there should be no '_' characters in the board names. Ref: NCSDK-22226 Signed-off-by: Marcin Jelinski --- applications/nrf5340_audio/README.rst | 4 ++-- .../nrf5340_audio/src/bluetooth/Kconfig | 4 ++-- .../nrf5340_audio/src/bluetooth/ble_core.c | 2 +- .../tools/buildprog/buildprog.py | 2 +- applications/nrf_desktop/README.rst | 6 +++--- .../Kconfig.shield | 4 ++-- .../nrf21540ek.overlay} | 0 .../nrf21540ek_fwd.overlay} | 6 +++--- doc/nrf/config_and_build/board_support.rst | 2 +- .../{nrf21540_ek.png => nrf21540ek.png} | Bin doc/nrf/device_guides/working_with_fem.rst | 20 +++++++++--------- .../working_with_nrf/nrf52/features.rst | 2 +- .../includes/sample_dtm_radio_test_fem.txt | 6 +++--- doc/nrf/includes/sample_fem_support.txt | 10 ++++----- .../releases_and_maturity/known_issues.rst | 2 +- .../releases/release-notes-1.7.0.rst | 4 ++-- .../bluetooth/direct_test_mode/CMakeLists.txt | 6 +++--- samples/bluetooth/direct_test_mode/README.rst | 2 +- ...nrf21540_ek.overlay => nrf21540ek.overlay} | 0 ..._ek_usb.overlay => nrf21540ek_usb.overlay} | 0 .../bluetooth/direct_test_mode/sample.yaml | 6 +++--- samples/esb/prx/sample.yaml | 2 +- samples/esb/ptx/sample.yaml | 2 +- samples/matter/lock/sample.yaml | 4 ++-- samples/peripheral/radio_test/CMakeLists.txt | 6 +++--- samples/peripheral/radio_test/README.rst | 2 +- ...nrf21540_ek.overlay => nrf21540ek.overlay} | 0 ..._ek_usb.overlay => nrf21540ek_usb.overlay} | 0 samples/peripheral/radio_test/sample.yaml | 6 +++--- samples/zigbee/ncp/sample.yaml | 2 +- west.yml | 2 +- 31 files changed, 57 insertions(+), 57 deletions(-) rename boards/shields/{nrf21540_ek => nrf21540ek}/Kconfig.shield (59%) rename boards/shields/{nrf21540_ek/nrf21540_ek.overlay => nrf21540ek/nrf21540ek.overlay} (100%) rename boards/shields/{nrf21540_ek/nrf21540_ek_fwd.overlay => nrf21540ek/nrf21540ek_fwd.overlay} (79%) rename doc/nrf/device_guides/images/{nrf21540_ek.png => nrf21540ek.png} (100%) rename samples/bluetooth/direct_test_mode/conf/remote_shell/{nrf21540_ek.overlay => nrf21540ek.overlay} (100%) rename samples/bluetooth/direct_test_mode/conf/remote_shell/{nrf21540_ek_usb.overlay => nrf21540ek_usb.overlay} (100%) rename samples/peripheral/radio_test/conf/remote_shell/{nrf21540_ek.overlay => nrf21540ek.overlay} (100%) rename samples/peripheral/radio_test/conf/remote_shell/{nrf21540_ek_usb.overlay => nrf21540ek_usb.overlay} (100%) diff --git a/applications/nrf5340_audio/README.rst b/applications/nrf5340_audio/README.rst index aaafc83b026..fe2b2f25638 100644 --- a/applications/nrf5340_audio/README.rst +++ b/applications/nrf5340_audio/README.rst @@ -396,12 +396,12 @@ Adding FEM support You can add support for the nRF21540 front-end module (FEM) to this application by using one of the following options, depending on how you decide to build the application: * If you opt for :ref:`nrf53_audio_app_building_script`, add the ``--nrf21540`` to the script's building command. -* If you opt for :ref:`nrf53_audio_app_building_standard`, add the ``-DSHIELD=nrf21540_ek_fwd`` to the ``west build`` command. +* If you opt for :ref:`nrf53_audio_app_building_standard`, add the ``-DSHIELD=nrf21540ek_fwd`` to the ``west build`` command. For example: .. code-block:: console - west build -b nrf5340_audio_dk_nrf5340_cpuapp --pristine -- -DCONFIG_AUDIO_DEV=1 -DSHIELD=nrf21540_ek_fwd -DCONF_FILE=prj_release.conf + west build -b nrf5340_audio_dk_nrf5340_cpuapp --pristine -- -DCONFIG_AUDIO_DEV=1 -DSHIELD=nrf21540ek_fwd -DCONF_FILE=prj_release.conf To set the TX power output, use the :ref:`CONFIG_NRF_21540_MAIN_TX_POWER ` and :ref:`CONFIG_NRF_21540_PRI_ADV_TX_POWER ` Kconfig options. diff --git a/applications/nrf5340_audio/src/bluetooth/Kconfig b/applications/nrf5340_audio/src/bluetooth/Kconfig index d6eeeace20d..9fbcc913e4b 100644 --- a/applications/nrf5340_audio/src/bluetooth/Kconfig +++ b/applications/nrf5340_audio/src/bluetooth/Kconfig @@ -211,12 +211,12 @@ config BLE_ADV_TX_POWER_DBM default -40 if BLE_ADV_TX_POWER_NEG_40DBM config NRF_21540_ACTIVE - def_bool $(shields_list_contains,nrf21540_ek_fwd) + def_bool $(shields_list_contains,nrf21540ek_fwd) select EXPERIMENTAL help The front end module can help boost the TX power as high as 20 dBm. Usually set through buildprog, if not set there, remember to add - -DSHIELD=nrf21540_ek_fwd when building app core to include the shield + -DSHIELD=nrf21540ek_fwd when building app core to include the shield overlay file. choice NRF_21540_MAIN_TX_POWER diff --git a/applications/nrf5340_audio/src/bluetooth/ble_core.c b/applications/nrf5340_audio/src/bluetooth/ble_core.c index 7c42e6ffa89..5b77891093b 100644 --- a/applications/nrf5340_audio/src/bluetooth/ble_core.c +++ b/applications/nrf5340_audio/src/bluetooth/ble_core.c @@ -112,7 +112,7 @@ static void on_bt_ready(int err) ble_core_le_lost_notify_enable(); #if (CONFIG_NRF_21540_ACTIVE) - /* Indexes for the pins gotten from nrf21540_ek_fwd.overlay */ + /* Indexes for the pins gotten from nrf21540ek_fwd.overlay */ uint8_t tx_pin = NRF_DT_GPIOS_TO_PSEL_BY_IDX(DT_PATH(nrf_gpio_forwarder, nrf21540_gpio_if), gpios, 0); uint8_t rx_pin = NRF_DT_GPIOS_TO_PSEL_BY_IDX(DT_PATH(nrf_gpio_forwarder, nrf21540_gpio_if), diff --git a/applications/nrf5340_audio/tools/buildprog/buildprog.py b/applications/nrf5340_audio/tools/buildprog/buildprog.py index f9126f71aef..bc1512f212b 100644 --- a/applications/nrf5340_audio/tools/buildprog/buildprog.py +++ b/applications/nrf5340_audio/tools/buildprog/buildprog.py @@ -107,7 +107,7 @@ def __build_cmd_get(core: Core, device: AudioDevice, build: BuildType, pristine, device_flag += " -DCONFIG_B0N_MINIMAL=y" if options.nrf21540: - device_flag += " -DSHIELD=nrf21540_ek_fwd" + device_flag += " -DSHIELD=nrf21540ek_fwd" if os.name == 'nt': release_flag = release_flag.replace('\\', '/') diff --git a/applications/nrf_desktop/README.rst b/applications/nrf_desktop/README.rst index 40e8678de86..5c3e50f7e34 100644 --- a/applications/nrf_desktop/README.rst +++ b/applications/nrf_desktop/README.rst @@ -813,12 +813,12 @@ Configuration Adding nRF21540 EK shield support ================================= -The nRF Desktop application can be used with the :ref:`ug_radio_fem_nrf21540_ek` shield, an RF front-end module (FEM) for the 2.4 GHz range extension. +The nRF Desktop application can be used with the :ref:`ug_radio_fem_nrf21540ek` shield, an RF front-end module (FEM) for the 2.4 GHz range extension. The shield can be used with any nRF Desktop HID application configured for a development kit that is fitted with Arduino-compatible connector (see the :guilabel:`DK` tab in `Requirements`_). This means that the shield support is not available for nRF Desktop's dedicated boards, such as ``nrf52840gmouse_nrf52840``, ``nrf52kbd_nrf52832``, or ``nrf52840dongle_nrf52840``. To build the application with the shield support, pass the ``SHIELD`` parameter to the build command. -For detailed information about building the nRF Desktop application for the nRF21540 EK, see the :ref:`ug_radio_fem_nrf21540_ek_programming` section on the nRF21540 EK documentation page. +For detailed information about building the nRF Desktop application for the nRF21540 EK, see the :ref:`ug_radio_fem_nrf21540ek_programming` section on the nRF21540 EK documentation page. .. note:: For the multi-core build, use the ``hci_rpmsg_`` as the *childImageName* parameter, because in the nRF Desktop application, network core runs using ``hci_rpmsg_``. @@ -826,7 +826,7 @@ For detailed information about building the nRF Desktop application for the nRF2 .. code-block:: console - west build -b nrf5340dk_nrf5340_cpuapp -- -DSHIELD=nrf21540_ek -Dhci_rpmsg_SHIELD=nrf21540_ek + west build -b nrf5340dk_nrf5340_cpuapp -- -DSHIELD=nrf21540ek -Dhci_rpmsg_SHIELD=nrf21540ek Building and running ******************** diff --git a/boards/shields/nrf21540_ek/Kconfig.shield b/boards/shields/nrf21540ek/Kconfig.shield similarity index 59% rename from boards/shields/nrf21540_ek/Kconfig.shield rename to boards/shields/nrf21540ek/Kconfig.shield index 1aa1c00ba47..58b21eb2186 100644 --- a/boards/shields/nrf21540_ek/Kconfig.shield +++ b/boards/shields/nrf21540ek/Kconfig.shield @@ -4,5 +4,5 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -config SHIELD_NRF21540_EK - def_bool $(shields_list_contains,nrf21540_ek) +config SHIELD_NRF21540EK + def_bool $(shields_list_contains,nrf21540ek) diff --git a/boards/shields/nrf21540_ek/nrf21540_ek.overlay b/boards/shields/nrf21540ek/nrf21540ek.overlay similarity index 100% rename from boards/shields/nrf21540_ek/nrf21540_ek.overlay rename to boards/shields/nrf21540ek/nrf21540ek.overlay diff --git a/boards/shields/nrf21540_ek/nrf21540_ek_fwd.overlay b/boards/shields/nrf21540ek/nrf21540ek_fwd.overlay similarity index 79% rename from boards/shields/nrf21540_ek/nrf21540_ek_fwd.overlay rename to boards/shields/nrf21540ek/nrf21540ek_fwd.overlay index 5645b394993..e5a5dd8beb0 100644 --- a/boards/shields/nrf21540_ek/nrf21540_ek_fwd.overlay +++ b/boards/shields/nrf21540ek/nrf21540ek_fwd.overlay @@ -4,14 +4,14 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -/* This file matches the contents of nrf21540_ek.overlay and is intended to be applied to nRF5340 - * application core when nrf21540_ek shield is provided to the network core's image build. +/* This file matches the contents of nrf21540ek.overlay and is intended to be applied to nRF5340 + * application core when nrf21540ek shield is provided to the network core's image build. * * For instance, consider an application targeted for nRF5340 application core that specifies * a child image targeted for nRF5340 network core, which drives the nRF21540 Front-End Module. * The shield overlays could be provided to the build using the following command: * - * west build -p -b nrf5340dk_nrf5340_cpuapp -- -DSHIELD=nrf21540_ek_fwd -D_SHIELD=nrf21540_ek + * west build -p -b nrf5340dk_nrf5340_cpuapp -- -DSHIELD=nrf21540ek_fwd -D_SHIELD=nrf21540ek */ &gpio_fwd { nrf21540-gpio-if { diff --git a/doc/nrf/config_and_build/board_support.rst b/doc/nrf/config_and_build/board_support.rst index 3d58b644d5d..be369a77a5c 100644 --- a/doc/nrf/config_and_build/board_support.rst +++ b/doc/nrf/config_and_build/board_support.rst @@ -135,7 +135,7 @@ The following boards are defined in the :file:`nrf/boards/arm/` folder. | | | | ``nrf7002dk_nrf5340_cpuapp_ns`` | +-------------------+------------+----------------------------------------------------------+---------------------------------------+ -The :ref:`nRF21540 EK shield ` is defined in the :file:`nrf/boards/shields` folder. +The :ref:`nRF21540 EK shield ` is defined in the :file:`nrf/boards/shields` folder. Custom boards ************* diff --git a/doc/nrf/device_guides/images/nrf21540_ek.png b/doc/nrf/device_guides/images/nrf21540ek.png similarity index 100% rename from doc/nrf/device_guides/images/nrf21540_ek.png rename to doc/nrf/device_guides/images/nrf21540ek.png diff --git a/doc/nrf/device_guides/working_with_fem.rst b/doc/nrf/device_guides/working_with_fem.rst index 2c0e3b2218a..bad0b81c909 100644 --- a/doc/nrf/device_guides/working_with_fem.rst +++ b/doc/nrf/device_guides/working_with_fem.rst @@ -531,7 +531,7 @@ Hardware support Two nRF21540 boards are available, showcasing the possibilities of the nRF21540 FEM: * :ref:`nRF21540 DK ` -* :ref:`ug_radio_fem_nrf21540_ek` +* :ref:`ug_radio_fem_nrf21540ek` Also, various Skyworks front-end modules are supported. For example, SKY66112-11EK has a 2-pin PA/LNA interface. @@ -551,7 +551,7 @@ Shields Shields are add-ons that you can attach to the development kit to extend its feature and functionalities. -.. _ug_radio_fem_nrf21540_ek: +.. _ug_radio_fem_nrf21540ek: nRF21540 EK ----------- @@ -572,10 +572,10 @@ GPIO and SPI are accessible through the Arduino Uno Rev3 compatible headers. The shield also features two additional SMA connectors hooked to the dual antenna ports from the RF FEM, to monitor the performance of the RF FEM using any equipment desired. The FEM SMA input can be connected to the nRF52 or nRF53 Series SoC RF output with a coaxial RF cable with SMA\SWF connectors. -.. figure:: images/nrf21540_ek.png +.. figure:: images/nrf21540ek.png :width: 350px :align: center - :alt: nRF21540_EK + :alt: nRF21540EK nRF21540 EK shield @@ -604,31 +604,31 @@ Pin assignment | D13 | SPI SCK | Serial Clock | +-----------------------+----------+-----------------+ -.. _ug_radio_fem_nrf21540_ek_programming: +.. _ug_radio_fem_nrf21540ek_programming: Programming ^^^^^^^^^^^ -Set ``-DSHIELD=nrf21540_ek`` when you invoke ``west build`` or ``cmake`` in your Zephyr application. +Set ``-DSHIELD=nrf21540ek`` when you invoke ``west build`` or ``cmake`` in your Zephyr application. Alternatively, add the shield in the project's :file:`CMakeLists.txt` file: .. code-block:: none - set(SHIELD nrf21540_ek) + set(SHIELD nrf21540ek) -To build with the |nRFVSC|, specify ``-DSHIELD=nrf21540_ek`` in the **Extra Cmake arguments** field. +To build with the |nRFVSC|, specify ``-DSHIELD=nrf21540ek`` in the **Extra Cmake arguments** field. See :ref:`cmake_options`. When building for a board with an additional network core, like the nRF5340, add the ``-DSHIELD`` variable with the *childImageName_* parameter between ``-D`` and ``SHIELD`` to build for the network core. In this case, the application core is only responsible for forwarding to the network core the pins needed to control the nRF21540 . -The application core can be set up to forward the needed pins using the ``-DSHIELD=nrf21540_ek_fwd`` setting. +The application core can be set up to forward the needed pins using the ``-DSHIELD=nrf21540ek_fwd`` setting. For example: .. parsed-literal:: :class: highlight - west build -b nrf5340dk_nrf5340_cpuapp -- -DSHIELD=nrf21540_ek_fwd -Dmultiprotocol_rpmsg_SHIELD=nrf21540_ek + west build -b nrf5340dk_nrf5340_cpuapp -- -DSHIELD=nrf21540ek_fwd -Dmultiprotocol_rpmsg_SHIELD=nrf21540ek In this command, the *childImageName_* parameter has the ``multiprotocol_rpmsg_`` value and builds a multiprotocol application with support for 802.15.4 and Bluetooth. The *childImageName_* parameter can take the following values: diff --git a/doc/nrf/device_guides/working_with_nrf/nrf52/features.rst b/doc/nrf/device_guides/working_with_nrf/nrf52/features.rst index 6ff3a9fe687..76cc25e5b47 100644 --- a/doc/nrf/device_guides/working_with_nrf/nrf52/features.rst +++ b/doc/nrf/device_guides/working_with_nrf/nrf52/features.rst @@ -72,7 +72,7 @@ Devices in the nRF52 Series are supported by these boards in the Zephyr open sou - ``nrf21540dk_nrf52840`` - `Product Specification `_ -See :ref:`ug_radio_fem_nrf21540_ek` to learn how to use this RF front-end module (FEM) with the nRF52 Series devices. +See :ref:`ug_radio_fem_nrf21540ek` to learn how to use this RF front-end module (FEM) with the nRF52 Series devices. Secure bootloader chain *********************** diff --git a/doc/nrf/includes/sample_dtm_radio_test_fem.txt b/doc/nrf/includes/sample_dtm_radio_test_fem.txt index 1216a4b3ea9..5c5f5602d7c 100644 --- a/doc/nrf/includes/sample_dtm_radio_test_fem.txt +++ b/doc/nrf/includes/sample_dtm_radio_test_fem.txt @@ -3,7 +3,7 @@ You can add support for the nRF21540 front-end module (FEM) to the sample. To add support for the nRF21540 FEM, build the sample for a board containing nRF21540 FEM like :ref:`nrf21540dk_nrf52840 ` or create a devicetree overlay file describing how FEM is connected to nRF5 SoC in your device. .. note:: - If you use the nRF21540 EK, append ``nrf21540_ek`` shield to your build command instructing build system to append the appropriate devicetree overlay file. + If you use the nRF21540 EK, append ``nrf21540ek`` shield to your build command instructing build system to append the appropriate devicetree overlay file. If you use the nRF21540 DK, build your application for the :ref:`nrf21540dk_nrf52840 ` board. The devicetree for the nRF21540 DK already contains the required FEM configuration, so you do not need to set an additional build option. @@ -11,11 +11,11 @@ For example, to build the sample from the command line for an nRF5340 DK with an .. code-block:: console - west build -b nrf5340dk_nrf5340_cpunet -- -DSHIELD=nrf21540_ek + west build -b nrf5340dk_nrf5340_cpunet -- -DSHIELD=nrf21540ek For more details refer to the following documentation: * :ref:`ug_radio_fem` * :ref:`ug_radio_fem_direct_support` * :ref:`ug_radio_fem_nrf21540_spi_gpio` -* :ref:`ug_radio_fem_nrf21540_ek` +* :ref:`ug_radio_fem_nrf21540ek` diff --git a/doc/nrf/includes/sample_fem_support.txt b/doc/nrf/includes/sample_fem_support.txt index 3ce6b2aa4b9..18c33013a91 100644 --- a/doc/nrf/includes/sample_fem_support.txt +++ b/doc/nrf/includes/sample_fem_support.txt @@ -3,8 +3,8 @@ You can add support for the nRF21540 front-end module to this sample by using on * Build the sample for one board that contains the nRF21540 FEM, such as :ref:`nrf21540dk_nrf52840 `. * Manually create a devicetree overlay file that describes how FEM is connected to the nRF5 SoC in your device. See :ref:`zephyr:set-devicetree-overlays` for different ways of adding the overlay file. -* Provide nRF21540 FEM capabilities by using a :ref:`shield `, for example the :ref:`ug_radio_fem_nrf21540_ek` shield that is available in the |NCS|. - In this case, build the project for a board connected to the shield you are using with an appropriate variable included in the build command, for example ``SHIELD=nrf21540_ek``. +* Provide nRF21540 FEM capabilities by using a :ref:`shield `, for example the :ref:`ug_radio_fem_nrf21540ek` shield that is available in the |NCS|. + In this case, build the project for a board connected to the shield you are using with an appropriate variable included in the build command, for example ``SHIELD=nrf21540ek``. This variable instructs the build system to append the appropriate devicetree overlay file. .. tabs:: @@ -12,7 +12,7 @@ You can add support for the nRF21540 front-end module to this sample by using on .. group-tab:: nRF Connect for VS Code To build the sample in the nRF Connect for VS Code IDE for an nRF52840 DK with the nRF21540 EK attached, add the shield variable in the build configuration's :guilabel:`Extra CMake arguments` and rebuild the build configuration. - For example: ``-DSHIELD=nrf21540_ek``. + For example: ``-DSHIELD=nrf21540ek``. See `nRF Connect for VS Code extension pack `_ documentation for more information. @@ -22,9 +22,9 @@ You can add support for the nRF21540 front-end module to this sample by using on .. code-block:: console - west build -b nrf52840dk_nrf52840 -- -DSHIELD=nrf21540_ek + west build -b nrf52840dk_nrf52840 -- -DSHIELD=nrf21540ek - See :ref:`Programming nRF21540 EK ` for information about how to program when you are using a board with a network core, for example nRF5340 DK. + See :ref:`Programming nRF21540 EK ` for information about how to program when you are using a board with a network core, for example nRF5340 DK. Each of these options adds the description of the nRF21540 FEM to the devicetree. See :ref:`ug_radio_fem` for more information about FEM in the |NCS|. diff --git a/doc/nrf/releases_and_maturity/known_issues.rst b/doc/nrf/releases_and_maturity/known_issues.rst index 55c2146239c..72e24bcdd66 100644 --- a/doc/nrf/releases_and_maturity/known_issues.rst +++ b/doc/nrf/releases_and_maturity/known_issues.rst @@ -2021,7 +2021,7 @@ NCSDK-16338: Setting gain for nRF21540 Front-end module does not work in the :re .. rst-class:: v1-9-0 NCSDK-13925: Build warning in the RF test samples when the nRF21540 EK support is enabled - :ref:`radio_test` and :ref:`direct_test_mode` build with warnings for nRF5340 with the :ref:`ug_radio_fem_nrf21540_ek` support. + :ref:`radio_test` and :ref:`direct_test_mode` build with warnings for nRF5340 with the :ref:`ug_radio_fem_nrf21540ek` support. **Affected platforms:** nRF5340, nRF21540 diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-1.7.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-1.7.0.rst index 0d57fa399b2..3aa7acdc14f 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-1.7.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-1.7.0.rst @@ -23,7 +23,7 @@ Highlights * :ref:`direct_test_mode` and :ref:`radio_test` sample support. * Support for Bluetooth® LE, Thread, Zigbee, and multiprotocol applications and samples using :ref:`nrfxlib:mpsl`. - * Support for :ref:`nRF21540 development kit (DK) `, :ref:`nRF21540 evaluation kit (EK) ` and custom board configurations. + * Support for :ref:`nRF21540 development kit (DK) `, :ref:`nRF21540 evaluation kit (EK) ` and custom board configurations. * Added Wi-Fi coexistence feature supported for development for Thread and Zigbee. * Added support for NFC and *pair before use* type of accessories to the Apple Find My add-on. @@ -226,7 +226,7 @@ Front-end module (FEM) * Added support for the nRF21540 GPIO interface to the nRF5340 network core. * Added support for RF front-end Modules (FEM) for nRF5340 in the :ref:`mpsl` library. The front-end module feature for nRF5340 in MPSL currently supports nRF21540, but does not support the SKY66112-11 device. -* Added a device tree shield definition for the nRF21540 Evaluation Kit with the :ref:`related documentation `. +* Added a device tree shield definition for the nRF21540 Evaluation Kit with the :ref:`related documentation `. Matter ------ diff --git a/samples/bluetooth/direct_test_mode/CMakeLists.txt b/samples/bluetooth/direct_test_mode/CMakeLists.txt index 99f6245c1a7..7e005d7c705 100644 --- a/samples/bluetooth/direct_test_mode/CMakeLists.txt +++ b/samples/bluetooth/direct_test_mode/CMakeLists.txt @@ -8,11 +8,11 @@ cmake_minimum_required(VERSION 3.20.0) if(DEFINED SHIELD AND "${BOARD}" STREQUAL "nrf5340dk_nrf5340_cpunet") string(REPLACE " " ";" SHIELD_LIST "${SHIELD}") foreach(sh IN LISTS SHIELD_LIST) - if("${sh}" STREQUAL "nrf21540_ek") + if("${sh}" STREQUAL "nrf21540ek") if(CONFIG_DTM_USB) - set(remote_shell_DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/conf/remote_shell/nrf21540_ek_usb.overlay) + set(remote_shell_DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/conf/remote_shell/nrf21540ek_usb.overlay) else() - set(remote_shell_DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/conf/remote_shell/nrf21540_ek.overlay) + set(remote_shell_DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/conf/remote_shell/nrf21540ek.overlay) endif() break() diff --git a/samples/bluetooth/direct_test_mode/README.rst b/samples/bluetooth/direct_test_mode/README.rst index adab0c1a05d..e640da73f7a 100644 --- a/samples/bluetooth/direct_test_mode/README.rst +++ b/samples/bluetooth/direct_test_mode/README.rst @@ -362,7 +362,7 @@ Use the following command: .. code-block:: console - west build samples/bluetooth/direct_test_mode -b nrf5340dk_nrf5340_cpunet -- -DSHIELD=nrf21540_ek -DCONFIG_DTM_USB=y + west build samples/bluetooth/direct_test_mode -b nrf5340dk_nrf5340_cpunet -- -DSHIELD=nrf21540ek -DCONFIG_DTM_USB=y .. _dtm_testing: diff --git a/samples/bluetooth/direct_test_mode/conf/remote_shell/nrf21540_ek.overlay b/samples/bluetooth/direct_test_mode/conf/remote_shell/nrf21540ek.overlay similarity index 100% rename from samples/bluetooth/direct_test_mode/conf/remote_shell/nrf21540_ek.overlay rename to samples/bluetooth/direct_test_mode/conf/remote_shell/nrf21540ek.overlay diff --git a/samples/bluetooth/direct_test_mode/conf/remote_shell/nrf21540_ek_usb.overlay b/samples/bluetooth/direct_test_mode/conf/remote_shell/nrf21540ek_usb.overlay similarity index 100% rename from samples/bluetooth/direct_test_mode/conf/remote_shell/nrf21540_ek_usb.overlay rename to samples/bluetooth/direct_test_mode/conf/remote_shell/nrf21540ek_usb.overlay diff --git a/samples/bluetooth/direct_test_mode/sample.yaml b/samples/bluetooth/direct_test_mode/sample.yaml index 3f4bc99dbac..a18e142f688 100644 --- a/samples/bluetooth/direct_test_mode/sample.yaml +++ b/samples/bluetooth/direct_test_mode/sample.yaml @@ -12,7 +12,7 @@ tests: tags: bluetooth ci_build sample.bluetooth.direct_test_mode.nrf5340_nrf21540: build_only: true - extra_args: SHIELD=nrf21540_ek + extra_args: SHIELD=nrf21540ek integration_platforms: - nrf5340dk_nrf5340_cpunet platform_allow: nrf5340dk_nrf5340_cpunet @@ -27,7 +27,7 @@ tests: tags: bluetooth ci_build sample.bluetooth.direct_test_mode.nrf5340_nrf21540_usb: build_only: true - extra_args: SHIELD=nrf21540_ek + extra_args: SHIELD=nrf21540ek extra_configs: - CONFIG_DTM_USB=y integration_platforms: @@ -36,7 +36,7 @@ tests: tags: bluetooth ci_build sample.bluetooth.direct_test_mode.nrf5340_nrf21540.no_automatic_power: build_only: true - extra_args: SHIELD=nrf21540_ek + extra_args: SHIELD=nrf21540ek extra_configs: - CONFIG_DTM_POWER_CONTROL_AUTOMATIC=n integration_platforms: diff --git a/samples/esb/prx/sample.yaml b/samples/esb/prx/sample.yaml index 6d036db6f9f..d6cc8067fc4 100644 --- a/samples/esb/prx/sample.yaml +++ b/samples/esb/prx/sample.yaml @@ -35,7 +35,7 @@ tests: tags: esb ci_build sample.esb.prx.nrf5340_nrf21540: build_only: true - extra_args: SHIELD=nrf21540_ek + extra_args: SHIELD=nrf21540ek integration_platforms: - nrf5340dk_nrf5340_cpunet platform_allow: nrf5340dk_nrf5340_cpunet diff --git a/samples/esb/ptx/sample.yaml b/samples/esb/ptx/sample.yaml index 57b5af37790..9f4725b5594 100644 --- a/samples/esb/ptx/sample.yaml +++ b/samples/esb/ptx/sample.yaml @@ -35,7 +35,7 @@ tests: tags: esb ci_build sample.esb.ptx.nrf5340_nrf21540: build_only: true - extra_args: SHIELD=nrf21540_ek + extra_args: SHIELD=nrf21540ek integration_platforms: - nrf5340dk_nrf5340_cpunet platform_allow: nrf5340dk_nrf5340_cpunet diff --git a/samples/matter/lock/sample.yaml b/samples/matter/lock/sample.yaml index e701d96983a..213678b1a60 100644 --- a/samples/matter/lock/sample.yaml +++ b/samples/matter/lock/sample.yaml @@ -33,9 +33,9 @@ tests: - nrf21540dk_nrf52840 platform_allow: > nrf52840dk_nrf52840 nrf21540dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp - sample.matter.lock.release.nrf21540_ek: + sample.matter.lock.release.nrf21540ek: build_only: true - extra_args: CONF_FILE=prj_release.conf SHIELD=nrf21540_ek + extra_args: CONF_FILE=prj_release.conf SHIELD=nrf21540ek integration_platforms: - nrf5340dk_nrf5340_cpuapp platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp diff --git a/samples/peripheral/radio_test/CMakeLists.txt b/samples/peripheral/radio_test/CMakeLists.txt index 2d2cd8c93ae..5548880adb2 100644 --- a/samples/peripheral/radio_test/CMakeLists.txt +++ b/samples/peripheral/radio_test/CMakeLists.txt @@ -9,11 +9,11 @@ cmake_minimum_required(VERSION 3.20.0) if(DEFINED SHIELD AND "${BOARD}" STREQUAL "nrf5340dk_nrf5340_cpunet") string(REPLACE " " ";" SHIELD_LIST "${SHIELD}") foreach(sh IN LISTS SHIELD_LIST) - if("${sh}" STREQUAL "nrf21540_ek") + if("${sh}" STREQUAL "nrf21540ek") if(CONFIG_RADIO_TEST_USB) - set(remote_shell_DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/conf/remote_shell/nrf21540_ek_usb.overlay) + set(remote_shell_DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/conf/remote_shell/nrf21540ek_usb.overlay) else() - set(remote_shell_DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/conf/remote_shell/nrf21540_ek.overlay) + set(remote_shell_DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/conf/remote_shell/nrf21540ek.overlay) endif() break() diff --git a/samples/peripheral/radio_test/README.rst b/samples/peripheral/radio_test/README.rst index ebe004cbf0d..4b0b54ca93a 100644 --- a/samples/peripheral/radio_test/README.rst +++ b/samples/peripheral/radio_test/README.rst @@ -187,7 +187,7 @@ You can use the following command: .. code-block:: console - west build samples/peripheral/radio_test -b nrf5340dk_nrf5340_cpunet -- -DSHIELD=nrf21540_ek -DCONFIG_RADIO_TEST_USB=y + west build samples/peripheral/radio_test -b nrf5340dk_nrf5340_cpunet -- -DSHIELD=nrf21540ek -DCONFIG_RADIO_TEST_USB=y .. note:: You can also build the sample with the remote IPC Service Shell for the |nRF7002DKnoref| using the ``nrf7002dk_nrf5340_cpunet`` build target in the commands. diff --git a/samples/peripheral/radio_test/conf/remote_shell/nrf21540_ek.overlay b/samples/peripheral/radio_test/conf/remote_shell/nrf21540ek.overlay similarity index 100% rename from samples/peripheral/radio_test/conf/remote_shell/nrf21540_ek.overlay rename to samples/peripheral/radio_test/conf/remote_shell/nrf21540ek.overlay diff --git a/samples/peripheral/radio_test/conf/remote_shell/nrf21540_ek_usb.overlay b/samples/peripheral/radio_test/conf/remote_shell/nrf21540ek_usb.overlay similarity index 100% rename from samples/peripheral/radio_test/conf/remote_shell/nrf21540_ek_usb.overlay rename to samples/peripheral/radio_test/conf/remote_shell/nrf21540ek_usb.overlay diff --git a/samples/peripheral/radio_test/sample.yaml b/samples/peripheral/radio_test/sample.yaml index 57eda033f38..fd161d5d373 100644 --- a/samples/peripheral/radio_test/sample.yaml +++ b/samples/peripheral/radio_test/sample.yaml @@ -14,7 +14,7 @@ tests: tags: ci_build sample.peripheral.radio_test.nrf5340_nrf21540: build_only: true - extra_args: SHIELD=nrf21540_ek + extra_args: SHIELD=nrf21540ek integration_platforms: - nrf5340dk_nrf5340_cpunet platform_allow: nrf5340dk_nrf5340_cpunet @@ -29,7 +29,7 @@ tests: tags: ci_build sample.peripheral.radio_test.nrf5340_nrf21540_usb: build_only: true - extra_args: SHIELD=nrf21540_ek + extra_args: SHIELD=nrf21540ek extra_configs: - CONFIG_RADIO_TEST_USB=y integration_platforms: @@ -38,7 +38,7 @@ tests: tags: ci_build sample.peripheral.radio_test.nrf5340_nrf21540.no_automatic_power: build_only: true - extra_args: SHIELD=nrf21540_ek + extra_args: SHIELD=nrf21540ek extra_configs: - CONFIG_RADIO_TEST_POWER_CONTROL_AUTOMATIC=n integration_platforms: diff --git a/samples/zigbee/ncp/sample.yaml b/samples/zigbee/ncp/sample.yaml index ae111f78114..b93dded3809 100644 --- a/samples/zigbee/ncp/sample.yaml +++ b/samples/zigbee/ncp/sample.yaml @@ -54,7 +54,7 @@ tests: sample.zigbee.ncp.with_nrf21540ek: build_only: true - extra_args: SHIELD=nrf21540_ek + extra_args: SHIELD=nrf21540ek integration_platforms: - nrf52840dk_nrf52840 platform_allow: nrf52840dk_nrf52840 diff --git a/west.yml b/west.yml index 42d1fdcafda..77ceea2c5d7 100644 --- a/west.yml +++ b/west.yml @@ -193,7 +193,7 @@ manifest: - sidewalk - name: homekit repo-path: sdk-homekit - revision: 77828c53c0753083e27f702801ac34cc56bc5c7b + revision: b58f49933e66903e7508cc763e01043f2fd64bd2 groups: - homekit - name: find-my