From 06f43d42bef663ce483653a6b2d842494e071994 Mon Sep 17 00:00:00 2001 From: Tomi Fontanilles Date: Thu, 16 Jan 2025 08:44:00 +0200 Subject: [PATCH] treewide: clean up nRF54L15 PDK leftovers Remove the leftover references to the nRF54L15 PDK, which has been removed. Signed-off-by: Tomi Fontanilles --- .../nrf54l15pdk_nrf54l15_cpuapp.overlay | 34 ------- .../nrf54l15pdk_nrf54l15_cpuapp.overlay | 91 ------------------- .../nrf54l15pdk_nrf54l15_cpuflpr.overlay | 91 ------------------- .../nrf54l15pdk_nrf54l15_vpr_launcher.overlay | 31 ------- .../boards/nrf54l15pdk_nrf54l15_cpuapp.conf | 8 -- .../boards/nrf54l15pdk_nrf54l15_cpuapp.conf | 9 -- samples/net/aws_iot/Kconfig.sysbuild | 4 +- .../boards/nrf54l15pdk_nrf54l15_cpuapp.conf | 40 -------- .../nrf54l15pdk_nrf54l15_cpuapp.overlay | 26 ------ .../boards/nrf54l15pdk_nrf54l15_cpuapp.conf | 1 - .../nrf54l15pdk_nrf54l15_cpuapp.overlay | 32 ------- .../nrf54l15pdk_nrf54l15_cpuapp.overlay | 16 ---- .../nrf54l15pdk_nrf54l15_cpuflpr.overlay | 20 ---- 13 files changed, 2 insertions(+), 401 deletions(-) delete mode 100644 boards/shields/nrf7002eb_interposer_p1/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay delete mode 100644 boards/shields/pca63565/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay delete mode 100644 boards/shields/pca63565/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay delete mode 100644 boards/shields/pca63565/boards/nrf54l15pdk_nrf54l15_vpr_launcher.overlay delete mode 100644 samples/bluetooth/conn_time_sync/boards/nrf54l15pdk_nrf54l15_cpuapp.conf delete mode 100644 samples/keys/hw_unique_key/boards/nrf54l15pdk_nrf54l15_cpuapp.conf delete mode 100644 samples/net/aws_iot/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf delete mode 100644 samples/net/aws_iot/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay delete mode 100644 tests/drivers/fprotect/storage/boards/nrf54l15pdk_nrf54l15_cpuapp.conf delete mode 100644 tests/drivers/fprotect/storage/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay delete mode 100644 tests/drivers/pwm/gpio_loopback/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay delete mode 100644 tests/drivers/pwm/gpio_loopback/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay diff --git a/boards/shields/nrf7002eb_interposer_p1/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/boards/shields/nrf7002eb_interposer_p1/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay deleted file mode 100644 index 76ae75150f8f..000000000000 --- a/boards/shields/nrf7002eb_interposer_p1/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include "../nrf7002eb_interposer_p1_gpio_map_1.dtsi" - -&pinctrl { - spi22_default: spi22_default { - group1 { - psels = , - , - ; - }; - }; - - spi22_sleep: spi22_sleep { - group1 { - psels = , - , - ; - low-power-enable; - }; - }; -}; - -edge_connector_spi: &spi22 { - status = "okay"; - cs-gpios = <&edge_connector 18 GPIO_ACTIVE_LOW>; - pinctrl-0 = <&spi22_default>; - pinctrl-1 = <&spi22_sleep>; - pinctrl-names = "default", "sleep"; -}; diff --git a/boards/shields/pca63565/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/boards/shields/pca63565/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay deleted file mode 100644 index 0533b61ea356..000000000000 --- a/boards/shields/pca63565/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (C) 2024 Nordic Semiconductor ASA - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - aliases { - sensor-bme688 = &i2c22; - accel0 = &adxl362; - accel-gyro = &bmi270; - /delete-property/ led0; - /delete-property/ led3; - /delete-property/ sw0; - }; -}; - -/delete-node/ &led0; // P2.09 is adxl362 SPIM_MISO -/delete-node/ &led3; // P1.14 is adxl362 interrupt signal -/delete-node/ &button0; // P1.13 is bmi270 chip select signal - -&pinctrl { - i2c22_default: i2c22_default { - group1 { - psels = , - ; - }; - }; - - i2c22_sleep: i2c22_sleep { - group1 { - psels = , - ; - low-power-enable; - }; - }; - - spi21_default: spi21_default { - group1 { - psels = , - , - ; - }; - }; - - spi21_sleep: spi21_sleep { - group1 { - psels = , - , - ; - low-power-enable; - }; - }; -}; - -&i2c22 { - status = "okay"; - zephyr,concat-buf-size = <512>; - pinctrl-0 = <&i2c22_default>; - pinctrl-1 = <&i2c22_sleep>; - pinctrl-names = "default", "sleep"; - - bme688: bme688@76 { - compatible = "bosch,bme680"; - status = "okay"; - reg = <0x76>; - }; -}; - -&spi21 { - status = "okay"; - pinctrl-0 = <&spi21_default>; - pinctrl-1 = <&spi21_sleep>; - pinctrl-names = "default", "sleep"; - cs-gpios = <&gpio1 13 GPIO_ACTIVE_LOW>, - <&gpio2 10 GPIO_ACTIVE_LOW>; - - bmi270: bmi270@0 { - compatible = "bosch,bmi270"; - status = "okay"; - reg = <0>; - spi-max-frequency = ; - }; - - adxl362: adxl362@1 { - compatible = "adi,adxl362"; - status = "okay"; - reg = <1>; - int1-gpios = <&gpio1 14 (GPIO_ACTIVE_HIGH)>; - spi-max-frequency = ; - }; -}; diff --git a/boards/shields/pca63565/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/boards/shields/pca63565/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay deleted file mode 100644 index 0533b61ea356..000000000000 --- a/boards/shields/pca63565/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (C) 2024 Nordic Semiconductor ASA - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - aliases { - sensor-bme688 = &i2c22; - accel0 = &adxl362; - accel-gyro = &bmi270; - /delete-property/ led0; - /delete-property/ led3; - /delete-property/ sw0; - }; -}; - -/delete-node/ &led0; // P2.09 is adxl362 SPIM_MISO -/delete-node/ &led3; // P1.14 is adxl362 interrupt signal -/delete-node/ &button0; // P1.13 is bmi270 chip select signal - -&pinctrl { - i2c22_default: i2c22_default { - group1 { - psels = , - ; - }; - }; - - i2c22_sleep: i2c22_sleep { - group1 { - psels = , - ; - low-power-enable; - }; - }; - - spi21_default: spi21_default { - group1 { - psels = , - , - ; - }; - }; - - spi21_sleep: spi21_sleep { - group1 { - psels = , - , - ; - low-power-enable; - }; - }; -}; - -&i2c22 { - status = "okay"; - zephyr,concat-buf-size = <512>; - pinctrl-0 = <&i2c22_default>; - pinctrl-1 = <&i2c22_sleep>; - pinctrl-names = "default", "sleep"; - - bme688: bme688@76 { - compatible = "bosch,bme680"; - status = "okay"; - reg = <0x76>; - }; -}; - -&spi21 { - status = "okay"; - pinctrl-0 = <&spi21_default>; - pinctrl-1 = <&spi21_sleep>; - pinctrl-names = "default", "sleep"; - cs-gpios = <&gpio1 13 GPIO_ACTIVE_LOW>, - <&gpio2 10 GPIO_ACTIVE_LOW>; - - bmi270: bmi270@0 { - compatible = "bosch,bmi270"; - status = "okay"; - reg = <0>; - spi-max-frequency = ; - }; - - adxl362: adxl362@1 { - compatible = "adi,adxl362"; - status = "okay"; - reg = <1>; - int1-gpios = <&gpio1 14 (GPIO_ACTIVE_HIGH)>; - spi-max-frequency = ; - }; -}; diff --git a/boards/shields/pca63565/boards/nrf54l15pdk_nrf54l15_vpr_launcher.overlay b/boards/shields/pca63565/boards/nrf54l15pdk_nrf54l15_vpr_launcher.overlay deleted file mode 100644 index ff8c22be1eba..000000000000 --- a/boards/shields/pca63565/boards/nrf54l15pdk_nrf54l15_vpr_launcher.overlay +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2024 Nordic Semiconductor ASA - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* - * SHIELD is applied to both FLPR and Application cores. - * Disable sensors on Application core because: - * - vpr_launcher is not using them; - * - prevent collision when both cores try to initialize same resource; - */ - -&i2c22 { - status = "disabled"; -}; - -&bme688 { - status = "disabled"; -}; - -&spi21 { - status = "disabled"; -}; - -&bmi270 { - status = "disabled"; -}; - -&adxl362 { - status = "disabled"; -}; diff --git a/samples/bluetooth/conn_time_sync/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/bluetooth/conn_time_sync/boards/nrf54l15pdk_nrf54l15_cpuapp.conf deleted file mode 100644 index f9cf1f1b5e72..000000000000 --- a/samples/bluetooth/conn_time_sync/boards/nrf54l15pdk_nrf54l15_cpuapp.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_NRFX_GPPI=y -CONFIG_BT_RX_STACK_SIZE=2048 diff --git a/samples/keys/hw_unique_key/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/keys/hw_unique_key/boards/nrf54l15pdk_nrf54l15_cpuapp.conf deleted file mode 100644 index a837c4540d24..000000000000 --- a/samples/keys/hw_unique_key/boards/nrf54l15pdk_nrf54l15_cpuapp.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_MBEDTLS_PSA_CRYPTO_C=y -CONFIG_MAIN_STACK_SIZE=4096 -CONFIG_MBEDTLS_ENABLE_HEAP=y diff --git a/samples/net/aws_iot/Kconfig.sysbuild b/samples/net/aws_iot/Kconfig.sysbuild index 1681fbe65ce3..8966d1633ac3 100644 --- a/samples/net/aws_iot/Kconfig.sysbuild +++ b/samples/net/aws_iot/Kconfig.sysbuild @@ -5,13 +5,13 @@ # choice BOOTLOADER - default BOOTLOADER_MCUBOOT if !BOARD_NATIVE_SIM && !BOARD_NRF54L15DK_NRF54L15_CPUAPP && !BOARD_NRF54L15PDK_NRF54L15_CPUAPP + default BOOTLOADER_MCUBOOT if !BOARD_NATIVE_SIM && !BOARD_NRF54L15DK_NRF54L15_CPUAPP endchoice config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY default y if BOARD_NRF7002DK_NRF5340_CPUAPP_NS config WIFI_NRF70 - default y if BOARD_NRF7002DK_NRF5340_CPUAPP_NS || BOARD_NRF54L15DK_NRF54L15_CPUAPP || BOARD_NRF54L15PDK_NRF54L15_CPUAPP + default y if BOARD_NRF7002DK_NRF5340_CPUAPP_NS || BOARD_NRF54L15DK_NRF54L15_CPUAPP source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/samples/net/aws_iot/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/net/aws_iot/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf deleted file mode 100644 index 29bfe06f5984..000000000000 --- a/samples/net/aws_iot/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# TODO: Workaround, disable memory guard to avoid false faults in application after boot -CONFIG_HW_STACK_PROTECTION=n - -CONFIG_BOOT_WATCHDOG_FEED=n - -# nRF54L15PDK uses SPI NOR external flash -CONFIG_GPIO=y -CONFIG_SPI=y -CONFIG_SPI_NOR=y -CONFIG_SPI_NOR_SFDP_DEVICETREE=y -CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 - -# TODO: NCSDK-28931: Cannot use fprotect twice, so disable it in MCUboot to -# test protecting Matter factory data. It can be enabled while there is a support -# for protection more than one region. -CONFIG_FPROTECT=n - -# required by SPI driver -CONFIG_MULTITHREADING=y - -# Partition mamager -CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y -CONFIG_PM_PARTITION_SIZE_MCUBOOT=0xF000 -CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y - -# Adjust the maximum sectors to the app image size of ~1.4MB -CONFIG_BOOT_MAX_IMG_SECTORS=512 - -# Currently, without tickless kernel, the SYSCOUNTER value after the software -# reset is not set properly and due to that the first system interrupt is not called -# in the proper time - the SYSCOUNTER value is set to the value from before -# reset + 1. Hence, the reboot time increases more and more. -# To avoid it enable tickles kernel for mcuboot. -CONFIG_TICKLESS_KERNEL=y diff --git a/samples/net/aws_iot/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/net/aws_iot/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay deleted file mode 100644 index 2dabe38016f0..000000000000 --- a/samples/net/aws_iot/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - /* Configure the partition manager to use the mx25r64 external flash memory. */ - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; - -&mx25r64 { - status = "okay"; -}; - -/* Restore full RRAM and SRAM space - by default some parts are dedicated to VPR */ -&cpuapp_rram { - reg = <0x0 DT_SIZE_K(1524)>; -}; - -&cpuapp_sram { - reg = <0x20000000 DT_SIZE_K(256)>; - ranges = <0x0 0x20000000 0x40000>; -}; diff --git a/tests/drivers/fprotect/storage/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/tests/drivers/fprotect/storage/boards/nrf54l15pdk_nrf54l15_cpuapp.conf deleted file mode 100644 index bff0b231bf2c..000000000000 --- a/tests/drivers/fprotect/storage/boards/nrf54l15pdk_nrf54l15_cpuapp.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PARTITION_MANAGER_ENABLED=n diff --git a/tests/drivers/fprotect/storage/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/fprotect/storage/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay deleted file mode 100644 index 51272d658425..000000000000 --- a/tests/drivers/fprotect/storage/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay +++ /dev/null @@ -1,32 +0,0 @@ -/ { - chosen { - zephyr,code-partition = &slot0_partition; - }; - -}; - -/delete-node/ &cpuapp_rram; - -&rram_controller { - reg = < 0x5004b000 0x17d000 >; - - cpuapp_rram: rram@0 { - compatible = "soc-nv-flash"; - erase-block-size = < 0x1000 >; - write-block-size = < 0x10 >; - reg = < 0x0 0x17d000 >; - partitions { - compatible = "fixed-partitions"; - #address-cells = < 0x1 >; - #size-cells = < 0x1 >; - slot0_partition: partition@0 { - label = "image-0"; - reg = < 0x0 0xd800 >; - }; - storage_partition: partition@175000 { - label = "storage"; - reg = < 0x175000 0x8000 >; - }; - }; - }; -}; diff --git a/tests/drivers/pwm/gpio_loopback/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/drivers/pwm/gpio_loopback/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay deleted file mode 100644 index 007596bc99e4..000000000000 --- a/tests/drivers/pwm/gpio_loopback/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include -#include - -/ { - pwm_to_gpio_loopback: pwm_to_gpio_loopback { - compatible = "test-pwm-to-gpio-loopback"; - pwms = <&pwm20 0 0 PWM_POLARITY_NORMAL>; - gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; - }; -}; diff --git a/tests/drivers/pwm/gpio_loopback/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay b/tests/drivers/pwm/gpio_loopback/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay deleted file mode 100644 index bae7902c0009..000000000000 --- a/tests/drivers/pwm/gpio_loopback/boards/nrf54l15pdk_nrf54l15_cpuflpr.overlay +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include -#include - -/ { - pwm_to_gpio_loopback: pwm_to_gpio_loopback { - compatible = "test-pwm-to-gpio-loopback"; - pwms = <&pwm20 0 0 PWM_POLARITY_NORMAL>; - gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; - }; -}; - -&uart30 { - /delete-property/ hw-flow-control; -};