diff --git a/boards/arm/nrf5340dk_nrf5340/CMakeLists.txt b/boards/arm/nrf5340dk_nrf5340/CMakeLists.txt index 9f91d932712fe..ec765842bad29 100644 --- a/boards/arm/nrf5340dk_nrf5340/CMakeLists.txt +++ b/boards/arm/nrf5340dk_nrf5340/CMakeLists.txt @@ -1,8 +1,7 @@ # Copyright (c) 2019 Nordic Semiconductor ASA. # SPDX-License-Identifier: Apache-2.0 -if (((CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS) - OR (CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)) +if ((CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS) AND CONFIG_BOARD_ENABLE_CPUNET) zephyr_library() zephyr_library_sources(nrf5340_cpunet_reset.c) @@ -30,9 +29,7 @@ if (CONFIG_BUILD_WITH_TFM) set(TFM_PUBLIC_KEY_FORMAT "full") endif() - if(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS) - set(TFM_INSTALL_DIR ${CMAKE_BINARY_DIR}/tfm/install/outputs/NORDIC_NRF/NRF5340PDK_NRF5340_CPUAPP) - elseif(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS) + if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS) set(TFM_INSTALL_DIR ${CMAKE_BINARY_DIR}/tfm/install/outputs/NORDIC_NRF/NRF5340DK_NRF5340_CPUAPP) endif() diff --git a/boards/arm/nrf5340dk_nrf5340/Kconfig b/boards/arm/nrf5340dk_nrf5340/Kconfig index f7ab2d18a4482..ae3bf2d6a9f66 100644 --- a/boards/arm/nrf5340dk_nrf5340/Kconfig +++ b/boards/arm/nrf5340dk_nrf5340/Kconfig @@ -1,4 +1,4 @@ -# nRF5340 (P)DK board configuration +# nRF5340 DK board configuration # Copyright (c) 2019 - 2021 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 @@ -39,7 +39,7 @@ config IPM_MSG_CH_1_RX endif # RPMSG_SERVICE_DUAL_IPM_SUPPORT -if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS +if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS config BOARD_ENABLE_DCDC_APP bool "Enable Application MCU DCDC converter" @@ -82,7 +82,6 @@ config BOARD_ENABLE_CPUNET config DOMAIN_CPUNET_BOARD string - default "nrf5340pdk_nrf5340_cpunet" if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS default "nrf5340dk_nrf5340_cpunet" if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS depends on BOARD_ENABLE_CPUNET help @@ -91,9 +90,9 @@ config DOMAIN_CPUNET_BOARD another board. For example hci_rpmsg on the nRF5340_cpunet for Bluetooth applications. -endif # BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS +endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS -if BOARD_NRF5340PDK_NRF5340_CPUNET || BOARD_NRF5340DK_NRF5340_CPUNET +if BOARD_NRF5340DK_NRF5340_CPUNET # BT_CTLR depends on BT. When BT is enabled we should default to also # enabling the controller. @@ -105,11 +104,10 @@ config BT_ECC config DOMAIN_CPUAPP_BOARD string - default "nrf5340pdk_nrf5340_cpuapp" if BOARD_NRF5340PDK_NRF5340_CPUNET default "nrf5340dk_nrf5340_cpuapp" if BOARD_NRF5340DK_NRF5340_CPUNET help The board which will be used for CPUAPP domain when creating a multi image application where one or more images should be located on another board. -endif # BOARD_NRF5340PDK_NRF5340_CPUNET || BOARD_NRF5340DK_NRF5340_CPUNET +endif # BOARD_NRF5340DK_NRF5340_CPUNET diff --git a/boards/arm/nrf5340dk_nrf5340/Kconfig.board b/boards/arm/nrf5340dk_nrf5340/Kconfig.board index 3031db8f4f71e..63bb169ff31c9 100644 --- a/boards/arm/nrf5340dk_nrf5340/Kconfig.board +++ b/boards/arm/nrf5340dk_nrf5340/Kconfig.board @@ -1,16 +1,10 @@ -# nRF5340 (P)DK NRF5340 board configuration +# nRF5340 DK NRF5340 board configuration # Copyright (c) 2019-2020 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 if SOC_NRF5340_CPUAPP_QKAA -config BOARD_NRF5340PDK_NRF5340_CPUAPP - bool "nRF5340 PDK nRF5340 Application MCU" - -config BOARD_NRF5340PDK_NRF5340_CPUAPPNS - bool "nRF5340 PDK nRF5340 Application MCU non-secure" - config BOARD_NRF5340DK_NRF5340_CPUAPP bool "nRF5340 DK nRF5340 Application MCU" @@ -19,10 +13,6 @@ config BOARD_NRF5340DK_NRF5340_CPUAPPNS endif # SOC_NRF5340_CPUAPP_QKAA -config BOARD_NRF5340PDK_NRF5340_CPUNET - bool "nRF5340 PDK NRF5340 Network MCU" - depends on SOC_NRF5340_CPUNET_QKAA - config BOARD_NRF5340DK_NRF5340_CPUNET bool "nRF5340 DK NRF5340 Network MCU" depends on SOC_NRF5340_CPUNET_QKAA diff --git a/boards/arm/nrf5340dk_nrf5340/Kconfig.defconfig b/boards/arm/nrf5340dk_nrf5340/Kconfig.defconfig index f04a905bdb7da..122dfd086ed30 100644 --- a/boards/arm/nrf5340dk_nrf5340/Kconfig.defconfig +++ b/boards/arm/nrf5340dk_nrf5340/Kconfig.defconfig @@ -1,26 +1,18 @@ -# nRF5340 (P)DK nRF5340 board configuration +# nRF5340 DK nRF5340 board configuration # Copyright (c) 2019-2020 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340PDK_NRF5340_CPUNET - -config BOARD_DEPRECATED_RELEASE - default "v2.6.0" - -endif # BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340PDK_NRF5340_CPUNET - -if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS +if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS config BOARD - default "nrf5340pdk_nrf5340_cpuapp" if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS default "nrf5340dk_nrf5340_cpuapp" if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS # By default, if we build for a Non-Secure version of the board, # force building with TF-M as the Secure Execution Environment. config BUILD_WITH_TFM - default y if BOARD_NRF5340DK_NRF5340_CPUAPPNS || BOARD_NRF5340PDK_NRF5340_CPUAPPNS + default y if BOARD_NRF5340DK_NRF5340_CPUAPPNS # Code Partition: # @@ -50,7 +42,7 @@ config BUILD_WITH_TFM DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition -if (BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP) && TRUSTED_EXECUTION_SECURE +if BOARD_NRF5340DK_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE config FLASH_LOAD_SIZE default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) @@ -58,9 +50,9 @@ config FLASH_LOAD_SIZE config SRAM_SIZE default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM_PARTITION),0,K) -endif # (BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP) && TRUSTED_EXECUTION_SECURE +endif # BOARD_NRF5340DK_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE -if BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPPNS +if BOARD_NRF5340DK_NRF5340_CPUAPPNS config FLASH_LOAD_OFFSET default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) @@ -68,7 +60,7 @@ config FLASH_LOAD_OFFSET config FLASH_LOAD_SIZE default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) -endif # BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPPNS +endif # BOARD_NRF5340DK_NRF5340_CPUAPPNS if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS) && USB @@ -80,8 +72,7 @@ config USB_DEVICE_STACK endif # (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS) && USB -endif # BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS +endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS config BOARD - default "nrf5340pdk_nrf5340_cpunet" if BOARD_NRF5340PDK_NRF5340_CPUNET default "nrf5340dk_nrf5340_cpunet" if BOARD_NRF5340DK_NRF5340_CPUNET diff --git a/boards/arm/nrf5340dk_nrf5340/board.cmake b/boards/arm/nrf5340dk_nrf5340/board.cmake index d651125937cc9..231ed1b4149a3 100644 --- a/boards/arm/nrf5340dk_nrf5340/board.cmake +++ b/boards/arm/nrf5340dk_nrf5340/board.cmake @@ -1,15 +1,14 @@ # SPDX-License-Identifier: Apache-2.0 -if(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS) +if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS) set(TFM_PUBLIC_KEY_FORMAT "full") endif() -if((CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS) OR - (CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)) +if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS) board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000") endif() -if(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET OR CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET) +if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET) board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000") endif() diff --git a/boards/arm/nrf5340dk_nrf5340/doc/index.rst b/boards/arm/nrf5340dk_nrf5340/doc/index.rst index bae6819a89f3a..1c00c1da8545a 100644 --- a/boards/arm/nrf5340dk_nrf5340/doc/index.rst +++ b/boards/arm/nrf5340dk_nrf5340/doc/index.rst @@ -52,12 +52,6 @@ More information about the board can be found at the The `Nordic Semiconductor Infocenter`_ contains the processor's information and the datasheet. -.. note:: - - nRF5340 PDK (preview development kit) is an earlier version of the - nRF5340 DK. nRF5340 PDK board is deprecated and is replaced by nRF5340 DK. - The support for nRF5340 PDK will be removed in Zephyr v2.6.0 release. - Hardware ******** @@ -332,6 +326,6 @@ References .. _IDAU: https://developer.arm.com/docs/100690/latest/attribution-units-sau-and-idau .. _nRF5340 DK website: - https://www.nordicsemi.com/Software-and-tools/Development-Kits/nRF5340-PDK + https://www.nordicsemi.com/Software-and-tools/Development-Kits/nRF5340-DK .. _Nordic Semiconductor Infocenter: https://infocenter.nordicsemi.com .. _Trusted Firmware M: https://www.trustedfirmware.org/projects/tf-m/ diff --git a/boards/arm/nrf5340dk_nrf5340/nrf5340_cpuapp_partition_conf.dts b/boards/arm/nrf5340dk_nrf5340/nrf5340_cpuapp_partition_conf.dts index b0cd4dcdc667a..6bb55d38a2be6 100644 --- a/boards/arm/nrf5340dk_nrf5340/nrf5340_cpuapp_partition_conf.dts +++ b/boards/arm/nrf5340dk_nrf5340/nrf5340_cpuapp_partition_conf.dts @@ -5,7 +5,7 @@ */ /* - * Default Flash planning for nrf5340pdk_nrf5340 CPUAPP (Application MCU). + * Default Flash planning for nrf5340dk_nrf5340 CPUAPP (Application MCU). * * Zephyr build for nRF5340 with ARM TrustZone-M support, * implies building Secure and Non-Secure Zephyr images. diff --git a/boards/arm/nrf5340dk_nrf5340/nrf5340_cpunet_reset.c b/boards/arm/nrf5340dk_nrf5340/nrf5340_cpunet_reset.c index 8cff522478a67..d0f5e5eefbf80 100644 --- a/boards/arm/nrf5340dk_nrf5340/nrf5340_cpunet_reset.c +++ b/boards/arm/nrf5340dk_nrf5340/nrf5340_cpunet_reset.c @@ -10,18 +10,12 @@ #include -LOG_MODULE_REGISTER(nrf5340pdk_nrf5340_cpuapp, CONFIG_LOG_DEFAULT_LEVEL); +LOG_MODULE_REGISTER(nrf5340dk_nrf5340_cpuapp, CONFIG_LOG_DEFAULT_LEVEL); #if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) /* This should come from DTS, possibly an overlay. */ -#if defined(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP) -#define CPUNET_UARTE_PIN_TX 25 -#define CPUNET_UARTE_PIN_RX 26 -#define CPUNET_UARTE_PORT_TRX NRF_P0 -#define CPUNET_UARTE_PIN_RTS 10 -#define CPUNET_UARTE_PIN_CTS 12 -#elif defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP) +#if defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP) #define CPUNET_UARTE_PIN_TX 1 #define CPUNET_UARTE_PIN_RX 0 #define CPUNET_UARTE_PORT_TRX NRF_P1 diff --git a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuapp.dts b/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuapp.dts deleted file mode 100644 index 6c94620bb3f0d..0000000000000 --- a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuapp.dts +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2019-2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/dts-v1/; -#include -#include "nrf5340_cpuapp_common.dts" - -/ { - model = "Nordic NRF5340 PDK NRF5340 Application"; - compatible = "nordic,nrf5340-pdk-nrf5340-cpuapp"; - - chosen { - zephyr,sram = &sram0_image; - zephyr,flash = &flash0; - zephyr,code-partition = &slot0_partition; - zephyr,sram-secure-partition = &sram0_s; - zephyr,sram-non-secure-partition = &sram0_ns; - }; -}; diff --git a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuapp.yaml b/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuapp.yaml deleted file mode 100644 index 2eaeee1af6df6..0000000000000 --- a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuapp.yaml +++ /dev/null @@ -1,15 +0,0 @@ -identifier: nrf5340pdk_nrf5340_cpuapp -name: NRF5340-PDK-NRF5340-application-MCU -type: mcu -arch: arm -toolchain: - - gnuarmemb - - xtools - - zephyr -ram: 64 -flash: 256 -supported: - - gpio - - i2c - - pwm - - watchdog diff --git a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuapp_defconfig b/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuapp_defconfig deleted file mode 100644 index 4a4b938b5739a..0000000000000 --- a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuapp_defconfig +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUAPP_QKAA=y -CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP=y - -CONFIG_NRF5340_CPUAPP_ERRATUM19=y - -# Enable MPU -CONFIG_ARM_MPU=y - -# Enable hardware stack protection -CONFIG_HW_STACK_PROTECTION=y - -# Enable TrustZone-M -CONFIG_ARM_TRUSTZONE_M=y - -# enable GPIO -CONFIG_GPIO=y - -# Enable uart driver -CONFIG_SERIAL=y - -# enable console -CONFIG_CONSOLE=y -CONFIG_UART_CONSOLE=y diff --git a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuappns.dts b/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuappns.dts deleted file mode 100644 index 1276185f7886c..0000000000000 --- a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuappns.dts +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2019-2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/dts-v1/; -#include -#include "nrf5340_cpuapp_common.dts" - -/ { - model = "Nordic NRF5340 PDK NRF5340 Application"; - compatible = "nordic,nrf5340-pdk-nrf5340-cpuapp"; - - chosen { - zephyr,sram = &sram0_ns; - zephyr,flash = &flash0; - zephyr,code-partition = &slot0_ns_partition; - }; -}; diff --git a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuappns.yaml b/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuappns.yaml deleted file mode 100644 index 8b888601bc5e4..0000000000000 --- a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuappns.yaml +++ /dev/null @@ -1,14 +0,0 @@ -identifier: nrf5340pdk_nrf5340_cpuappns -name: NRF5340-PDK-NRF5340-application-MCU-Non-Secure -type: mcu -arch: arm -toolchain: - - gnuarmemb - - xtools - - zephyr -ram: 192 -flash: 192 -supported: - - i2c - - pwm - - watchdog diff --git a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuappns_defconfig b/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuappns_defconfig deleted file mode 100644 index 757e6b7e1a335..0000000000000 --- a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpuappns_defconfig +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUAPP_QKAA=y -CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS=y - -# Enable MPU -CONFIG_ARM_MPU=y - -# Enable hardware stack protection -CONFIG_HW_STACK_PROTECTION=y - -# Enable TrustZone-M -CONFIG_ARM_TRUSTZONE_M=y - -# This Board implies building Non-Secure firmware -CONFIG_TRUSTED_EXECUTION_NONSECURE=y - -# enable GPIO -CONFIG_GPIO=y - -# Enable uart driver -CONFIG_SERIAL=y - -# enable console -CONFIG_CONSOLE=y -CONFIG_UART_CONSOLE=y diff --git a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpunet.dts b/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpunet.dts deleted file mode 100644 index 439f4a51ac0c3..0000000000000 --- a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpunet.dts +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright (c) 2019-2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/dts-v1/; -#include - -/ { - model = "Nordic NRF5340 PDK NRF5340 Network"; - compatible = "nordic,nrf5340-pdk-nrf5340-cpunet"; - - chosen { - zephyr,console = &uart0; - zephyr,shell-uart = &uart0; - zephyr,uart-mcumgr = &uart0; - zephyr,bt-mon-uart = &uart0; - zephyr,bt-c2h-uart = &uart0; - zephyr,sram = &sram1; - zephyr,flash = &flash1; - zephyr,code-partition = &slot0_partition; - }; - - leds { - compatible = "gpio-leds"; - led0: led_0 { - gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; - label = "Green LED 0"; - }; - led1: led_1 { - gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; - label = "Green LED 1"; - }; - led2: led_2 { - gpios = <&gpio0 30 GPIO_ACTIVE_LOW>; - label = "Green LED 2"; - }; - led3: led_3 { - gpios = <&gpio0 31 GPIO_ACTIVE_LOW>; - label = "Green LED 3"; - }; - }; - - buttons { - compatible = "gpio-keys"; - button0: button_0 { - gpios = <&gpio0 23 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; - label = "Push button 1"; - }; - button1: button_1 { - gpios = <&gpio0 24 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; - label = "Push button 2"; - }; - button2: button_2 { - gpios = <&gpio0 8 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; - label = "Push button 3"; - }; - button3: button_3 { - gpios = <&gpio0 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; - label = "Push button 4"; - }; - }; - - arduino_header: connector { - compatible = "arduino-header-r3"; - #gpio-cells = <2>; - gpio-map-mask = <0xffffffff 0xffffffc0>; - gpio-map-pass-thru = <0 0x3f>; - gpio-map = <0 0 &gpio0 4 0>, /* A0 */ - <1 0 &gpio0 5 0>, /* A1 */ - <2 0 &gpio0 6 0>, /* A2 */ - <3 0 &gpio0 7 0>, /* A3 */ - <4 0 &gpio0 25 0>, /* A4 */ - <5 0 &gpio0 26 0>, /* A5 */ - <6 0 &gpio1 0 0>, /* D0 */ - <7 0 &gpio1 1 0>, /* D1 */ - <8 0 &gpio1 4 0>, /* D2 */ - <9 0 &gpio1 5 0>, /* D3 */ - <10 0 &gpio1 6 0>, /* D4 */ - <11 0 &gpio1 7 0>, /* D5 */ - <12 0 &gpio1 8 0>, /* D6 */ - <13 0 &gpio1 9 0>, /* D7 */ - <14 0 &gpio1 10 0>, /* D8 */ - <15 0 &gpio1 11 0>, /* D9 */ - <16 0 &gpio1 12 0>, /* D10 */ - <17 0 &gpio1 13 0>, /* D11 */ - <18 0 &gpio1 14 0>, /* D12 */ - <19 0 &gpio1 15 0>, /* D13 */ - <20 0 &gpio1 2 0>, /* D14 */ - <21 0 &gpio1 3 0>; /* D15 */ - }; - - /* These aliases are provided for compatibility with samples */ - aliases { - led0 = &led0; - led1 = &led1; - led2 = &led2; - led3 = &led3; - sw0 = &button0; - sw1 = &button1; - sw2 = &button2; - sw3 = &button3; - }; -}; - -&gpiote { - status = "okay"; -}; - -&gpio0 { - status = "okay"; -}; - -&gpio1 { - status = "okay"; -}; - -&uart0 { - status = "okay"; - current-speed = <115200>; - tx-pin = <25>; - rx-pin = <26>; - rts-pin = <10>; - cts-pin = <12>; -}; - -arduino_i2c: &i2c0 { - compatible = "nordic,nrf-twim"; - /* Cannot be used together with uart0. */ - /* status = "okay"; */ - sda-pin = <34>; - scl-pin = <35>; -}; - -arduino_spi: &spi0 { - compatible = "nordic,nrf-spim"; - /* Cannot be used together with uart0. */ - /* status = "okay"; */ - sck-pin = <47>; - miso-pin = <46>; - mosi-pin = <45>; - cs-gpios = <&arduino_header 16 GPIO_ACTIVE_LOW>; /* D10 */ -}; - -&timer0 { - status = "okay"; -}; - -&timer1 { - status = "okay"; -}; - -&timer2 { - status = "okay"; -}; - -&flash1 { - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - boot_partition: partition@0 { - label = "mcuboot"; - reg = <0x00000000 0xc000>; - }; - slot0_partition: partition@c000 { - label = "image-0"; - reg = <0x0000C000 0x12000>; - }; - slot1_partition: partition@1e000 { - label = "image-1"; - reg = <0x0001E000 0x12000>; - }; - scratch_partition: partition@30000 { - label = "image-scratch"; - reg = <0x00030000 0xa000>; - }; - storage_partition: partition@3a000 { - label = "storage"; - reg = <0x0003a000 0x6000>; - }; - }; -}; - -/* Include shared RAM configuration file */ -#include "nrf5340_shared_sram_planning_conf.dts" diff --git a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpunet.yaml b/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpunet.yaml deleted file mode 100644 index ce5c34346a5fa..0000000000000 --- a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpunet.yaml +++ /dev/null @@ -1,12 +0,0 @@ -identifier: nrf5340pdk_nrf5340_cpunet -name: NRF5340-PDK-NRF5340-network-MCU -type: mcu -arch: arm -toolchain: - - gnuarmemb - - xtools - - zephyr -ram: 64 -flash: 256 -supported: - - watchdog diff --git a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpunet_defconfig b/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpunet_defconfig deleted file mode 100644 index 8d37bbce5b8fb..0000000000000 --- a/boards/arm/nrf5340dk_nrf5340/nrf5340pdk_nrf5340_cpunet_defconfig +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_SOC_SERIES_NRF53X=y -CONFIG_SOC_NRF5340_CPUNET_QKAA=y -CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET=y - -# Enable MPU -CONFIG_ARM_MPU=y - -# Enable hardware stack protection -CONFIG_HW_STACK_PROTECTION=y - -# enable GPIO -CONFIG_GPIO=y - -# Enable uart driver -CONFIG_SERIAL=y - -# enable console -CONFIG_CONSOLE=y -CONFIG_UART_CONSOLE=y diff --git a/doc/guides/test/twister.rst b/doc/guides/test/twister.rst index 777bac486a207..ed17f9097bcf4 100644 --- a/doc/guides/test/twister.rst +++ b/doc/guides/test/twister.rst @@ -607,11 +607,11 @@ example:: fixtures: - gpio_loopback id: 000683290670 - notes: An nrf5340pdk_nrf5340 is detected as an nrf52840dk_nrf52840 with no serial + notes: An nrf5340dk_nrf5340 is detected as an nrf52840dk_nrf52840 with no serial port, and three serial ports with an unknown platform. The board id of the serial ports is not the same as the board id of the the development kit. If you regenerate this file you will need to update serial to reference the third port, and platform - to nrf5340pdk_nrf5340_cpuapp or another supported board target. + to nrf5340dk_nrf5340_cpuapp or another supported board target. platform: nrf52840dk_nrf52840 product: J-Link runner: jlink diff --git a/drivers/clock_control/Kconfig.nrf b/drivers/clock_control/Kconfig.nrf index d5c0855b184d5..6ff44476a819c 100644 --- a/drivers/clock_control/Kconfig.nrf +++ b/drivers/clock_control/Kconfig.nrf @@ -56,7 +56,6 @@ endchoice config CLOCK_CONTROL_NRF_K32SRC_RC_CALIBRATION bool "Enable LF clock calibration" depends on !SOC_SERIES_NRF91X && CLOCK_CONTROL_NRF_K32SRC_RC - default n if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS default y help If calibration is disabled when RC is used for low frequency clock then diff --git a/dts/arm/nordic/nrf5340_cpuapp_qkaa_eng_a.dtsi b/dts/arm/nordic/nrf5340_cpuapp_qkaa_eng_a.dtsi deleted file mode 100644 index b253d0f1f4b2b..0000000000000 --- a/dts/arm/nordic/nrf5340_cpuapp_qkaa_eng_a.dtsi +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2019 - 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include -#include - -&flash0 { - reg = <0x00000000 DT_SIZE_K(1024)>; -}; - -&sram0 { - reg = <0x20000000 DT_SIZE_K(512)>; -}; - -&sram1 { - reg = <0x21000000 DT_SIZE_K(64)>; -}; - -&mpu { - arm,num-mpu-regions = <16>; -}; - -/ { - soc { - compatible = "nordic,nRF5340-CPUAPP-QKAA", "nordic,nRF5340-CPUAPP", "nordic,nRF53", "simple-bus"; - }; -}; - -/* - * Several peripherals are not functional on ENG_A revision - * so we delete the corresponding DTS nodes. - */ -/delete-node/ &i2c2; -/delete-node/ &i2c3; -/delete-node/ &spi2; -/delete-node/ &spi3; -/delete-node/ &uart2; -/delete-node/ &uart3; -/delete-node/ &usbd; -/delete-node/ &pwm3; -/delete-node/ &wdt1; diff --git a/dts/arm/nordic/nrf5340_cpuappns_qkaa_eng_a.dtsi b/dts/arm/nordic/nrf5340_cpuappns_qkaa_eng_a.dtsi deleted file mode 100644 index fd45d7ccdbcc8..0000000000000 --- a/dts/arm/nordic/nrf5340_cpuappns_qkaa_eng_a.dtsi +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2019 - 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include -#include - -&flash0 { - reg = <0x00000000 DT_SIZE_K(1024)>; -}; - -&sram0 { - reg = <0x20000000 DT_SIZE_K(512)>; -}; - -&sram1 { - reg = <0x21000000 DT_SIZE_K(64)>; -}; - -&mpu { - arm,num-mpu-regions = <16>; -}; - -/ { - soc { - compatible = "nordic,nRF5340-CPUAPP-QKAA", "nordic,nRF5340-CPUAPP", "nordic,nRF53", "simple-bus"; - }; -}; diff --git a/dts/arm/nordic/nrf5340_cpunet_qkaa_eng_a.dtsi b/dts/arm/nordic/nrf5340_cpunet_qkaa_eng_a.dtsi deleted file mode 100644 index 969d0a22a3250..0000000000000 --- a/dts/arm/nordic/nrf5340_cpunet_qkaa_eng_a.dtsi +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2019 - 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include -#include - -&flash1 { - reg = <0x01000000 DT_SIZE_K(256)>; -}; - -&sram0 { - reg = <0x20000000 DT_SIZE_K(512)>; -}; - -&sram1 { - reg = <0x21000000 DT_SIZE_K(64)>; -}; - -&mpu { - arm,num-mpu-regions = <16>; -}; - -/ { - soc { - compatible = "nordic,nRF5340-CPUNET-QKAA", "nordic,nRF5340-CPUNET", "nordic,nRF53", "simple-bus"; - }; -}; diff --git a/modules/Kconfig.tfm b/modules/Kconfig.tfm index 835dfbf1dd194..accae0f8a7122 100644 --- a/modules/Kconfig.tfm +++ b/modules/Kconfig.tfm @@ -9,7 +9,6 @@ config TFM_BOARD string default "nordic_nrf/nrf9160dk_nrf9160" if BOARD_NRF9160DK_NRF9160NS default "nordic_nrf/nrf5340dk_nrf5340_cpuapp" if BOARD_NRF5340DK_NRF5340_CPUAPPNS - default "nordic_nrf/nrf5340pdk_nrf5340_cpuapp" if BOARD_NRF5340PDK_NRF5340_CPUAPPNS default "nxp/lpcxpresso55s69" if BOARD_LPCXPRESSO55S69_CPU0 default "mps2/an521" if BOARD_MPS2_AN521 default "stm/nucleo_l552ze_q" if BOARD_NUCLEO_L552ZE_Q diff --git a/samples/tfm_integration/psa_level_1/README.rst b/samples/tfm_integration/psa_level_1/README.rst index f1755600ea219..6e402bc0add77 100644 --- a/samples/tfm_integration/psa_level_1/README.rst +++ b/samples/tfm_integration/psa_level_1/README.rst @@ -156,7 +156,7 @@ On nRF5340 and nRF9160: ======================= Build Zephyr with a non-secure configuration -(``-DBOARD=nrf5340pdk_nrf5340_cpuappns`` or ``-DBOARD=nrf9160dk_nrf9160ns``). +(``-DBOARD=nrf5340dk_nrf5340_cpuappns`` or ``-DBOARD=nrf9160dk_nrf9160ns``). Example, for nRF9160, using ``cmake`` and ``ninja`` diff --git a/samples/tfm_integration/psa_level_1/sample.yaml b/samples/tfm_integration/psa_level_1/sample.yaml index f8fd75cde6ef7..a6c69dcf402e4 100644 --- a/samples/tfm_integration/psa_level_1/sample.yaml +++ b/samples/tfm_integration/psa_level_1/sample.yaml @@ -5,8 +5,8 @@ sample: tests: sample.psa_level_1: tags: introduction tfm - platform_allow: mps2_an521_nonsecure lpcxpresso55s69_ns nrf5340pdk_nrf5340_cpuappns - nrf5340dk_nrf5340_cpuappns nrf9160dk_nrf9160ns v2m_musca_s1_nonsecure + platform_allow: mps2_an521_nonsecure lpcxpresso55s69_ns nrf5340dk_nrf5340_cpuappns + nrf9160dk_nrf9160ns v2m_musca_s1_nonsecure harness: console harness_config: type: multi_line diff --git a/samples/tfm_integration/tfm_ipc/README.rst b/samples/tfm_integration/tfm_ipc/README.rst index 77e8a8a75631f..89bb05fa0a7f7 100644 --- a/samples/tfm_integration/tfm_ipc/README.rst +++ b/samples/tfm_integration/tfm_ipc/README.rst @@ -162,7 +162,7 @@ On nRF5340 and nRF9160: ======================= Build Zephyr with a non-secure configuration -(``-DBOARD=nrf5340pdk_nrf5340_cpuappns`` or ``-DBOARD=nrf9160dk_nrf9160ns``). +(``-DBOARD=nrf5340dk_nrf5340_cpuappns`` or ``-DBOARD=nrf9160dk_nrf9160ns``). Example, for nRF9160, using ``cmake`` and ``ninja`` diff --git a/samples/tfm_integration/tfm_ipc/sample.yaml b/samples/tfm_integration/tfm_ipc/sample.yaml index 026b2dbbffc55..96c8f46f0dca3 100644 --- a/samples/tfm_integration/tfm_ipc/sample.yaml +++ b/samples/tfm_integration/tfm_ipc/sample.yaml @@ -5,7 +5,7 @@ sample: tests: sample.tfm_ipc: tags: introduction tfm - platform_allow: mps2_an521_nonsecure lpcxpresso55s69_ns nrf5340pdk_nrf5340_cpuappns + platform_allow: mps2_an521_nonsecure lpcxpresso55s69_ns nrf5340dk_nrf5340_cpuappns nrf9160dk_nrf9160ns nucleo_l552ze_q_ns v2m_musca_s1_nonsecure harness: console diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig index 05e74412b9888..63e8775aa1cdf 100644 --- a/subsys/bluetooth/controller/Kconfig +++ b/subsys/bluetooth/controller/Kconfig @@ -606,7 +606,7 @@ endif # BT_CTLR config BT_CTLR_DEBUG_PINS_CPUAPP bool "Bluetooth Controller Debug Pins" - depends on BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP + depends on BOARD_NRF5340DK_NRF5340_CPUAPP help Route debug GPIO toggling for the BLE Controller. Enable this when using Bluetooth Controller Debug Pins in co-processor and the main diff --git a/subsys/bluetooth/controller/Kconfig.ll_sw_split b/subsys/bluetooth/controller/Kconfig.ll_sw_split index ffa4057154827..d73177f6d3056 100644 --- a/subsys/bluetooth/controller/Kconfig.ll_sw_split +++ b/subsys/bluetooth/controller/Kconfig.ll_sw_split @@ -658,7 +658,7 @@ config BT_CTLR_PROFILE_ISR config BT_CTLR_DEBUG_PINS bool "Bluetooth Controller Debug Pins" - depends on BOARD_NRF51DK_NRF51422 || BOARD_NRF52DK_NRF52832 || BOARD_NRF52DK_NRF52810 || BOARD_NRF52840DK_NRF52840 || BOARD_NRF5340PDK_NRF5340_CPUNET || BOARD_NRF5340DK_NRF5340_CPUNET || BOARD_RV32M1_VEGA + depends on BOARD_NRF51DK_NRF51422 || BOARD_NRF52DK_NRF52832 || BOARD_NRF52DK_NRF52810 || BOARD_NRF52840DK_NRF52840 || BOARD_NRF5340DK_NRF5340_CPUNET || BOARD_RV32M1_VEGA help Turn on debug GPIO toggling for the BLE Controller. This is useful when debugging with a logic analyzer or profiling certain sections of diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/debug.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/debug.h index e19198e3cdf4c..1657f18f3c200 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/debug.h +++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/debug.h @@ -7,9 +7,7 @@ #if defined(CONFIG_BT_CTLR_DEBUG_PINS) || \ defined(CONFIG_BT_CTLR_DEBUG_PINS_CPUAPP) -#if defined(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP) || \ - defined(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET) || \ - defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP) || \ +#if defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP) || \ defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET) #define DEBUG_PORT NRF_P1 #define DEBUG_PIN_IDX0 0 @@ -32,8 +30,7 @@ #define DEBUG_PIN7 BIT(DEBUG_PIN_IDX7) #define DEBUG_PIN8 BIT(DEBUG_PIN_IDX8) #define DEBUG_PIN9 BIT(DEBUG_PIN_IDX9) -#if defined(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP) || \ - defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP) +#if defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP) #define DEBUG_SETUP() \ do { \ DEBUG_PORT->PIN_CNF[DEBUG_PIN_IDX0] = \ @@ -67,7 +64,7 @@ (GPIO_PIN_CNF_MCUSEL_NetworkMCU << \ GPIO_PIN_CNF_MCUSEL_Pos); \ } while (0) -#endif /* CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP */ +#endif /* CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP */ #elif defined(CONFIG_BOARD_NRF52840DK_NRF52840) #define DEBUG_PORT NRF_P1 #define DEBUG_PIN0 BIT(1) diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/swi.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/swi.h index 3ead9e19e0d98..eb9da5652ffb1 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/swi.h +++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/swi.h @@ -21,8 +21,7 @@ #elif defined(CONFIG_SOC_SERIES_NRF53X) /* nRF53 Series Engineering D and Revision 1 IRQ mapping */ -#if defined(CONFIG_SOC_NRF5340_CPUNET) && \ - !defined(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET) +#if defined(CONFIG_SOC_NRF5340_CPUNET) #define HAL_SWI_RADIO_IRQ SWI2_IRQn #define HAL_SWI_WORKER_IRQ RTC0_IRQn @@ -34,21 +33,7 @@ #define HAL_SWI_JOB_IRQ SWI3_IRQn #endif -/* nRF53 Series Engineering A IRQ mapping */ -#elif defined(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET) - -/* NOTE: nRF5340 Engineering A Errata [29] SWI: SWIRQ is not functional */ -#define HAL_SWI_RADIO_IRQ EGU0_IRQn -#define HAL_SWI_WORKER_IRQ RTC0_IRQn - -#if !defined(CONFIG_BT_CTLR_LOW_LAT) && \ - (CONFIG_BT_CTLR_ULL_HIGH_PRIO == CONFIG_BT_CTLR_ULL_LOW_PRIO) -#define HAL_SWI_JOB_IRQ HAL_SWI_WORKER_IRQ -#else -#error "Use an unused IRQ line to implement a second SW IRQ." -#endif - -#endif /* CONFIG_BOARD_NRF5340PDK_NRF5340_CPUNET */ +#endif /* CONFIG_SOC_NRF5340_CPUNET */ #endif /* CONFIG_SOC_SERIES_NRF53X */ diff --git a/tests/kernel/mem_protect/mem_protect/testcase.yaml b/tests/kernel/mem_protect/mem_protect/testcase.yaml index a7502e7703cb6..49aaf2e621fc7 100644 --- a/tests/kernel/mem_protect/mem_protect/testcase.yaml +++ b/tests/kernel/mem_protect/mem_protect/testcase.yaml @@ -11,7 +11,6 @@ tests: kernel.memory_protection.gap_filling.arm: filter: CONFIG_ARCH_HAS_USERSPACE and CONFIG_MPU_REQUIRES_NON_OVERLAPPING_REGIONS arch_allow: arm - platform_allow: efr32_radio_brd4180a mps2_an521 nrf5340pdk_nrf5340_cpuapp - nrf5340pdk_nrf5340_cpunet nrf9160dk_nrf9160 + platform_allow: efr32_radio_brd4180a mps2_an521 nrf9160dk_nrf9160 extra_args: CONFIG_MPU_GAP_FILLING=y tags: kernel security userspace ignore_faults diff --git a/tests/kernel/mem_protect/userspace/testcase.yaml b/tests/kernel/mem_protect/userspace/testcase.yaml index e3ebfacdd20b4..f9a4af9cb84cc 100644 --- a/tests/kernel/mem_protect/userspace/testcase.yaml +++ b/tests/kernel/mem_protect/userspace/testcase.yaml @@ -10,7 +10,6 @@ tests: kernel.memory_protection.userspace.gap_filling.arm: filter: CONFIG_ARCH_HAS_USERSPACE and CONFIG_MPU_REQUIRES_NON_OVERLAPPING_REGIONS arch_allow: arm - platform_allow: efr32_radio_brd4180a mps2_an521 nrf5340pdk_nrf5340_cpuapp - nrf5340pdk_nrf5340_cpunet nrf9160dk_nrf9160 + platform_allow: efr32_radio_brd4180a mps2_an521 nrf9160dk_nrf9160 extra_args: CONFIG_MPU_GAP_FILLING=y tags: kernel security userspace ignore_faults diff --git a/tests/kernel/profiling/profiling_api/testcase.yaml b/tests/kernel/profiling/profiling_api/testcase.yaml index 1d41bcaca8df8..2b2f161e9a0d3 100644 --- a/tests/kernel/profiling/profiling_api/testcase.yaml +++ b/tests/kernel/profiling/profiling_api/testcase.yaml @@ -3,5 +3,5 @@ tests: arch_exclude: nios2 platform_exclude: em_starterkit litex_vexriscv rv32m1_vega_zero_riscy rv32m1_vega_ri5cy - nrf5340dk_nrf5340_cpunet nrf5340pdk_nrf5340_cpunet + nrf5340dk_nrf5340_cpunet tags: kernel diff --git a/tests/kernel/tickless/tickless_concept/testcase.yaml b/tests/kernel/tickless/tickless_concept/testcase.yaml index 76ecc8686ed02..9b22ff23fff08 100644 --- a/tests/kernel/tickless/tickless_concept/testcase.yaml +++ b/tests/kernel/tickless/tickless_concept/testcase.yaml @@ -5,5 +5,5 @@ tests: # consistently when coverage is enabled. Disable until 14173 is fixed. platform_exclude: qemu_x86_coverage litex_vexriscv rv32m1_vega_zero_riscy rv32m1_vega_ri5cy - nrf5340dk_nrf5340_cpunet nrf5340pdk_nrf5340_cpunet + nrf5340dk_nrf5340_cpunet tags: kernel diff --git a/tests/kernel/timer/timer_api/testcase.yaml b/tests/kernel/timer/timer_api/testcase.yaml index 184f6ffacce0d..6445920744dd5 100644 --- a/tests/kernel/timer/timer_api/testcase.yaml +++ b/tests/kernel/timer/timer_api/testcase.yaml @@ -7,5 +7,5 @@ tests: arch_exclude: nios2 posix platform_exclude: qemu_x86_coverage litex_vexriscv rv32m1_vega_zero_riscy rv32m1_vega_ri5cy - nrf5340dk_nrf5340_cpunet nrf5340pdk_nrf5340_cpunet + nrf5340dk_nrf5340_cpunet tags: kernel timer userspace diff --git a/tests/subsys/power/power_mgmt/testcase.yaml b/tests/subsys/power/power_mgmt/testcase.yaml index 81ed406a88cfa..96b83e0b485d5 100644 --- a/tests/subsys/power/power_mgmt/testcase.yaml +++ b/tests/subsys/power/power_mgmt/testcase.yaml @@ -6,7 +6,7 @@ tests: # provide a timer driver. Other platforms are excluded because # they lack some other required feature. platform_exclude: rv32m1_vega_ri5cy rv32m1_vega_zero_riscy litex_vexriscv - nrf5340dk_nrf5340_cpunet nrf5340pdk_nrf5340_cpunet + nrf5340dk_nrf5340_cpunet integration_platforms: - qemu_x86 - mps2_an385