From cd3a78056d9f0c82e4b1ec995d775d58fa8346d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= Date: Thu, 5 Dec 2024 09:35:27 +0100 Subject: [PATCH] samples: drivers: jesd216: Remove unnecessary Kconfig option changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is no longer needed to enable a specific flash driver in the sample configuration. An appropriate driver (together with its dependencies, like the SPI bus) for a given target will be enabled automatically based on what is enabled in DTS. Signed-off-by: Andrzej Głąbek --- samples/drivers/jesd216/boards/bmd_345_eval.conf | 8 -------- samples/drivers/jesd216/boards/mr_canhubk3.conf | 5 ----- .../drivers/jesd216/boards/nrf52840dk_nrf52840.conf | 10 ---------- .../jesd216/boards/nrf52840dk_nrf52840_spi.conf | 8 -------- samples/drivers/jesd216/prj.conf | 5 ----- samples/drivers/jesd216/sample.yaml | 1 - 6 files changed, 37 deletions(-) delete mode 100644 samples/drivers/jesd216/boards/bmd_345_eval.conf delete mode 100644 samples/drivers/jesd216/boards/mr_canhubk3.conf delete mode 100644 samples/drivers/jesd216/boards/nrf52840dk_nrf52840.conf delete mode 100644 samples/drivers/jesd216/boards/nrf52840dk_nrf52840_spi.conf diff --git a/samples/drivers/jesd216/boards/bmd_345_eval.conf b/samples/drivers/jesd216/boards/bmd_345_eval.conf deleted file mode 100644 index 8c262a3483e..00000000000 --- a/samples/drivers/jesd216/boards/bmd_345_eval.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (c) 2021 Linumiz -# -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_SPI=n -CONFIG_SPI_NOR=n -CONFIG_NORDIC_QSPI_NOR=y diff --git a/samples/drivers/jesd216/boards/mr_canhubk3.conf b/samples/drivers/jesd216/boards/mr_canhubk3.conf deleted file mode 100644 index b625f401a1c..00000000000 --- a/samples/drivers/jesd216/boards/mr_canhubk3.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2023 NXP -# SPDX-License-Identifier: Apache-2.0 - -# Override defaults for SPI NOR flash driver -CONFIG_SPI_NOR=n diff --git a/samples/drivers/jesd216/boards/nrf52840dk_nrf52840.conf b/samples/drivers/jesd216/boards/nrf52840dk_nrf52840.conf deleted file mode 100644 index 976830569e3..00000000000 --- a/samples/drivers/jesd216/boards/nrf52840dk_nrf52840.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2019 Peter Bigot Consulting, LLC -# Copyright (c) 2019 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: Apache-2.0 -# - -CONFIG_SPI=n -CONFIG_SPI_NOR=n -#CONFIG_NORDIC_QSPI_NOR=y diff --git a/samples/drivers/jesd216/boards/nrf52840dk_nrf52840_spi.conf b/samples/drivers/jesd216/boards/nrf52840dk_nrf52840_spi.conf deleted file mode 100644 index 15982f1c92e..00000000000 --- a/samples/drivers/jesd216/boards/nrf52840dk_nrf52840_spi.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (c) 2022 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: Apache-2.0 -# - -CONFIG_SPI=y -CONFIG_SPI_NOR=y diff --git a/samples/drivers/jesd216/prj.conf b/samples/drivers/jesd216/prj.conf index c5c747a3bb3..b1b51a1e12f 100644 --- a/samples/drivers/jesd216/prj.conf +++ b/samples/drivers/jesd216/prj.conf @@ -1,8 +1,3 @@ CONFIG_STDOUT_CONSOLE=y CONFIG_FLASH=y CONFIG_FLASH_JESD216_API=y - -# Assume the standard SPI NOR flash driver. If the device uses -# another driver add an override configuration in boards/. -CONFIG_SPI=y -CONFIG_SPI_NOR=y diff --git a/samples/drivers/jesd216/sample.yaml b/samples/drivers/jesd216/sample.yaml index 5dcdc6678dc..0ea0dae331a 100644 --- a/samples/drivers/jesd216/sample.yaml +++ b/samples/drivers/jesd216/sample.yaml @@ -26,7 +26,6 @@ tests: sample.drivers.jesd216.nrf52840dk_spi: extra_args: - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_spi.overlay - - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_spi.conf platform_allow: nrf52840dk/nrf52840 integration_platforms: - nrf52840dk/nrf52840