From 5a0ecb964186320828625b0fd2f2ddd889cc28ab Mon Sep 17 00:00:00 2001 From: Dominik Ermel Date: Wed, 3 Apr 2024 17:05:32 +0200 Subject: [PATCH] flash: Move dependency on FLASH_PAGE_LAYOUT where it belongs The commit adds dependency on Kconfig FLASH_PAGE_LAYOUT to subsystems that really require it: FCB, NVS, LittleFS and removes direct selection from '*.conf' files where no longer needed. Signed-off-by: Dominik Ermel --- drivers/flash/Kconfig.sam | 1 - drivers/flash/Kconfig.stm32 | 1 - drivers/flash/Kconfig.stm32_ospi | 1 - drivers/flash/Kconfig.stm32_qspi | 1 - samples/bluetooth/direct_adv/prj.conf | 1 - samples/bluetooth/mesh_demo/prj.conf | 1 - samples/bluetooth/mesh_provisioner/prj.conf | 1 - samples/bluetooth/peripheral/prj.conf | 1 - samples/bluetooth/peripheral_accept_list/prj.conf | 1 - samples/bluetooth/peripheral_hids/prj.conf | 1 - samples/boards/nrf/mesh/onoff-app/prj.conf | 1 - samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/prj.conf | 1 - samples/boards/reel_board/mesh_badge/prj.conf | 1 - samples/drivers/soc_flash_nand/prj.conf | 1 - samples/drivers/soc_flash_nrf/prj.conf | 1 - samples/subsys/fs/format/prj.conf | 1 - samples/subsys/fs/littlefs/prj.conf | 1 - samples/subsys/nvs/prj.conf | 1 - samples/subsys/settings/prj.conf | 1 - samples/subsys/shell/fs/prj.conf | 1 - samples/subsys/shell/fs/prj_flash_load.conf | 1 - samples/subsys/usb/cdc_acm/overlay-composite-cdc-dfu.conf | 1 - samples/subsys/usb/dfu/prj.conf | 1 - subsys/fs/fcb/Kconfig | 1 + subsys/fs/nvs/Kconfig | 2 ++ subsys/net/l2/openthread/Kconfig | 1 - subsys/testsuite/Kconfig | 1 - tests/bluetooth/mesh/blob_io_flash/prj.conf | 1 - tests/bluetooth/mesh_shell/prj.conf | 1 - tests/bluetooth/shell/log.conf | 1 - tests/bluetooth/shell/prj.conf | 1 - tests/bsim/bluetooth/host/att/long_read/prj.conf | 1 - tests/bsim/bluetooth/host/att/open_close/prj.conf | 1 - tests/bsim/bluetooth/host/gatt/ccc_store/prj.conf | 1 - tests/bsim/bluetooth/host/gatt/ccc_store/prj_2.conf | 1 - tests/bsim/bluetooth/host/gatt/sc_indicate/prj.conf | 1 - tests/bsim/bluetooth/host/id/settings/prj.conf | 1 - tests/bsim/bluetooth/host/privacy/peripheral/prj.conf | 1 - .../bsim/bluetooth/host/privacy/peripheral/prj_rpa_expired.conf | 1 - .../bsim/bluetooth/host/privacy/peripheral/prj_rpa_sharing.conf | 1 - tests/bsim/bluetooth/host/security/ccc_update/prj.conf | 1 - tests/bsim/bluetooth/host/security/ccc_update/prj_2.conf | 1 - .../bluetooth/host/security/security_changed_callback/prj.conf | 1 - tests/bsim/bluetooth/mesh/overlay_pst.conf | 1 - tests/subsys/fs/fcb/prj.conf | 1 - tests/subsys/fs/littlefs/prj.conf | 1 - tests/subsys/fs/multi-fs/prj.conf | 1 - tests/subsys/fs/multi-fs/prj_fs_shell.conf | 1 - tests/subsys/fs/nvs/prj.conf | 1 - tests/subsys/settings/fcb/prj.conf | 1 - tests/subsys/settings/fcb_init/prj.conf | 1 - tests/subsys/settings/file/prj.conf | 1 - tests/subsys/settings/functional/fcb/prj.conf | 1 - tests/subsys/settings/functional/file/prj.conf | 1 - tests/subsys/settings/functional/nvs/prj.conf | 1 - tests/subsys/settings/nvs/prj.conf | 1 - tests/subsys/storage/stream/stream_flash/prj.conf | 1 - 57 files changed, 3 insertions(+), 55 deletions(-) diff --git a/drivers/flash/Kconfig.sam b/drivers/flash/Kconfig.sam index 64df895bd6a..bb014d65279 100644 --- a/drivers/flash/Kconfig.sam +++ b/drivers/flash/Kconfig.sam @@ -7,7 +7,6 @@ config SOC_FLASH_SAM bool "Atmel SAM flash driver" default y depends on DT_HAS_ATMEL_SAM_FLASH_CONTROLLER_ENABLED - select FLASH_PAGE_LAYOUT select FLASH_HAS_PAGE_LAYOUT select FLASH_HAS_DRIVER_ENABLED select MPU_ALLOW_FLASH_WRITE if ARM_MPU diff --git a/drivers/flash/Kconfig.stm32 b/drivers/flash/Kconfig.stm32 index a452ab8b98d..1ba8c33a7ec 100644 --- a/drivers/flash/Kconfig.stm32 +++ b/drivers/flash/Kconfig.stm32 @@ -11,7 +11,6 @@ config SOC_FLASH_STM32 depends on DT_HAS_ST_STM32_FLASH_CONTROLLER_ENABLED select FLASH_HAS_DRIVER_ENABLED default y - select FLASH_PAGE_LAYOUT select FLASH_HAS_PAGE_LAYOUT select MPU_ALLOW_FLASH_WRITE if ARM_MPU select USE_STM32_HAL_FLASH if BT_STM32WBA diff --git a/drivers/flash/Kconfig.stm32_ospi b/drivers/flash/Kconfig.stm32_ospi index c61f29d44b0..305fcfac76d 100644 --- a/drivers/flash/Kconfig.stm32_ospi +++ b/drivers/flash/Kconfig.stm32_ospi @@ -16,7 +16,6 @@ config FLASH_STM32_OSPI select USE_STM32_HAL_MDMA if SOC_SERIES_STM32H7X select FLASH_HAS_DRIVER_ENABLED select FLASH_JESD216 - select FLASH_PAGE_LAYOUT select FLASH_HAS_PAGE_LAYOUT select DMA if $(DT_STM32_OCTOSPI_1_HAS_DMA) || $(DT_STM32_OCTOSPI_2_HAS_DMA) select USE_STM32_HAL_DMA if $(DT_STM32_OCTOSPI_1_HAS_DMA) || \ diff --git a/drivers/flash/Kconfig.stm32_qspi b/drivers/flash/Kconfig.stm32_qspi index 6ba00c81c9e..c97be5ef354 100644 --- a/drivers/flash/Kconfig.stm32_qspi +++ b/drivers/flash/Kconfig.stm32_qspi @@ -14,7 +14,6 @@ config FLASH_STM32_QSPI select USE_STM32_HAL_MDMA if SOC_SERIES_STM32H7X select FLASH_HAS_DRIVER_ENABLED select FLASH_JESD216 - select FLASH_PAGE_LAYOUT select FLASH_HAS_PAGE_LAYOUT select DMA if $(DT_STM32_QUADSPI_HAS_DMA) select USE_STM32_HAL_DMA if $(DT_STM32_QUADSPI_HAS_DMA) diff --git a/samples/bluetooth/direct_adv/prj.conf b/samples/bluetooth/direct_adv/prj.conf index 6a633da1923..2af54670b51 100644 --- a/samples/bluetooth/direct_adv/prj.conf +++ b/samples/bluetooth/direct_adv/prj.conf @@ -15,7 +15,6 @@ CONFIG_BT_DEVICE_APPEARANCE=833 CONFIG_BT_KEYS_OVERWRITE_OLDEST=y CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y CONFIG_SETTINGS=y diff --git a/samples/bluetooth/mesh_demo/prj.conf b/samples/bluetooth/mesh_demo/prj.conf index 1fe22df04ef..df67555b021 100644 --- a/samples/bluetooth/mesh_demo/prj.conf +++ b/samples/bluetooth/mesh_demo/prj.conf @@ -27,7 +27,6 @@ CONFIG_BT_MESH_LOOPBACK_BUFS=8 CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y CONFIG_SETTINGS=y diff --git a/samples/bluetooth/mesh_provisioner/prj.conf b/samples/bluetooth/mesh_provisioner/prj.conf index 341dd49ed2e..71cf6d6a14d 100644 --- a/samples/bluetooth/mesh_provisioner/prj.conf +++ b/samples/bluetooth/mesh_provisioner/prj.conf @@ -41,7 +41,6 @@ CONFIG_BT_MESH_CDB_APP_KEY_COUNT=3 CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y CONFIG_SETTINGS=y diff --git a/samples/bluetooth/peripheral/prj.conf b/samples/bluetooth/peripheral/prj.conf index 9946a3107bc..5d577265d6e 100644 --- a/samples/bluetooth/peripheral/prj.conf +++ b/samples/bluetooth/peripheral/prj.conf @@ -20,7 +20,6 @@ CONFIG_BT_DEVICE_NAME_MAX=65 CONFIG_BT_KEYS_OVERWRITE_OLDEST=y CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y CONFIG_SETTINGS=y diff --git a/samples/bluetooth/peripheral_accept_list/prj.conf b/samples/bluetooth/peripheral_accept_list/prj.conf index 3395353388a..563ee758d2e 100644 --- a/samples/bluetooth/peripheral_accept_list/prj.conf +++ b/samples/bluetooth/peripheral_accept_list/prj.conf @@ -16,7 +16,6 @@ CONFIG_BT_KEYS_OVERWRITE_OLDEST=y CONFIG_BT_SETTINGS=y CONFIG_BT_FILTER_ACCEPT_LIST=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y CONFIG_SETTINGS=y diff --git a/samples/bluetooth/peripheral_hids/prj.conf b/samples/bluetooth/peripheral_hids/prj.conf index dd21313836c..10274a865d2 100644 --- a/samples/bluetooth/peripheral_hids/prj.conf +++ b/samples/bluetooth/peripheral_hids/prj.conf @@ -12,7 +12,6 @@ CONFIG_BT_DEVICE_APPEARANCE=962 CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y CONFIG_SETTINGS=y diff --git a/samples/boards/nrf/mesh/onoff-app/prj.conf b/samples/boards/nrf/mesh/onoff-app/prj.conf index 6c3a08f44ea..0fdf19b8cfc 100644 --- a/samples/boards/nrf/mesh/onoff-app/prj.conf +++ b/samples/boards/nrf/mesh/onoff-app/prj.conf @@ -6,7 +6,6 @@ CONFIG_GPIO=y CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y CONFIG_SETTINGS=y diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/prj.conf b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/prj.conf index e617afed89f..b5a01e39e56 100644 --- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/prj.conf +++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/prj.conf @@ -4,7 +4,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y CONFIG_SETTINGS=y diff --git a/samples/boards/reel_board/mesh_badge/prj.conf b/samples/boards/reel_board/mesh_badge/prj.conf index 833ca55da34..cce6826abb8 100644 --- a/samples/boards/reel_board/mesh_badge/prj.conf +++ b/samples/boards/reel_board/mesh_badge/prj.conf @@ -64,7 +64,6 @@ CONFIG_CHARACTER_FRAMEBUFFER=y CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y CONFIG_SETTINGS=y diff --git a/samples/drivers/soc_flash_nand/prj.conf b/samples/drivers/soc_flash_nand/prj.conf index 463cd27a152..53a45c34889 100644 --- a/samples/drivers/soc_flash_nand/prj.conf +++ b/samples/drivers/soc_flash_nand/prj.conf @@ -6,5 +6,4 @@ CONFIG_HEAP_MEM_POOL_SIZE=363840 # Enable Flash CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_LOG=y diff --git a/samples/drivers/soc_flash_nrf/prj.conf b/samples/drivers/soc_flash_nrf/prj.conf index 48e64121b6a..4a6b0a51c56 100644 --- a/samples/drivers/soc_flash_nrf/prj.conf +++ b/samples/drivers/soc_flash_nrf/prj.conf @@ -1,6 +1,5 @@ CONFIG_STDOUT_CONSOLE=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_MPU_ALLOW_FLASH_WRITE=y CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y CONFIG_FCB=y diff --git a/samples/subsys/fs/format/prj.conf b/samples/subsys/fs/format/prj.conf index e7dded045d5..8df386705d2 100644 --- a/samples/subsys/fs/format/prj.conf +++ b/samples/subsys/fs/format/prj.conf @@ -3,7 +3,6 @@ CONFIG_LOG_MODE_MINIMAL=y CONFIG_FLASH=y CONFIG_FLASH_MAP=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FILE_SYSTEM=y CONFIG_FILE_SYSTEM_MKFS=y diff --git a/samples/subsys/fs/littlefs/prj.conf b/samples/subsys/fs/littlefs/prj.conf index 673735fb0fd..9c0d25926bb 100644 --- a/samples/subsys/fs/littlefs/prj.conf +++ b/samples/subsys/fs/littlefs/prj.conf @@ -18,7 +18,6 @@ CONFIG_LOG_MODE_MINIMAL=y CONFIG_FLASH=y CONFIG_FLASH_MAP=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FILE_SYSTEM=y CONFIG_FILE_SYSTEM_LITTLEFS=y diff --git a/samples/subsys/nvs/prj.conf b/samples/subsys/nvs/prj.conf index b0b5e3041bd..17bcf7fb2e3 100644 --- a/samples/subsys/nvs/prj.conf +++ b/samples/subsys/nvs/prj.conf @@ -1,5 +1,4 @@ CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_NVS=y CONFIG_LOG=y diff --git a/samples/subsys/settings/prj.conf b/samples/subsys/settings/prj.conf index a37cf73ad72..25c66253846 100644 --- a/samples/subsys/settings/prj.conf +++ b/samples/subsys/settings/prj.conf @@ -1,6 +1,5 @@ CONFIG_STDOUT_CONSOLE=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_SETTINGS=y diff --git a/samples/subsys/shell/fs/prj.conf b/samples/subsys/shell/fs/prj.conf index 1f2863e0038..43bedbd85df 100644 --- a/samples/subsys/shell/fs/prj.conf +++ b/samples/subsys/shell/fs/prj.conf @@ -14,4 +14,3 @@ CONFIG_FILE_SYSTEM_SHELL=y CONFIG_FILE_SYSTEM_LITTLEFS=y CONFIG_FLASH_MAP=y -CONFIG_FLASH_PAGE_LAYOUT=y diff --git a/samples/subsys/shell/fs/prj_flash_load.conf b/samples/subsys/shell/fs/prj_flash_load.conf index ae5e4d727e1..9910dd096ec 100644 --- a/samples/subsys/shell/fs/prj_flash_load.conf +++ b/samples/subsys/shell/fs/prj_flash_load.conf @@ -14,4 +14,3 @@ CONFIG_SHELL_BACKEND_SERIAL_RX_RING_BUFFER_SIZE=128 CONFIG_FILE_SYSTEM_LITTLEFS=y CONFIG_FLASH_MAP=y -CONFIG_FLASH_PAGE_LAYOUT=y diff --git a/samples/subsys/usb/cdc_acm/overlay-composite-cdc-dfu.conf b/samples/subsys/usb/cdc_acm/overlay-composite-cdc-dfu.conf index e1fc3c9a994..35eeca22f4d 100644 --- a/samples/subsys/usb/cdc_acm/overlay-composite-cdc-dfu.conf +++ b/samples/subsys/usb/cdc_acm/overlay-composite-cdc-dfu.conf @@ -9,5 +9,4 @@ CONFIG_USB_DFU_CLASS=y CONFIG_FLASH=y CONFIG_IMG_MANAGER=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_BOOTLOADER_MCUBOOT=y diff --git a/samples/subsys/usb/dfu/prj.conf b/samples/subsys/usb/dfu/prj.conf index c6a84a554bd..6bf6f1ee310 100644 --- a/samples/subsys/usb/dfu/prj.conf +++ b/samples/subsys/usb/dfu/prj.conf @@ -9,7 +9,6 @@ CONFIG_FLASH=y CONFIG_FLASH_MAP=y CONFIG_STREAM_FLASH=y CONFIG_IMG_MANAGER=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_LOG=y CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y diff --git a/subsys/fs/fcb/Kconfig b/subsys/fs/fcb/Kconfig index 50ddb7009b2..442a649c1cb 100644 --- a/subsys/fs/fcb/Kconfig +++ b/subsys/fs/fcb/Kconfig @@ -11,6 +11,7 @@ config FCB bool "Flash Circular Buffer support" depends on FLASH_MAP select CRC + select FLASH_PAGE_LAYOUT help Enable support of Flash Circular Buffer. diff --git a/subsys/fs/nvs/Kconfig b/subsys/fs/nvs/Kconfig index de4f282ee98..209e2ad29a6 100644 --- a/subsys/fs/nvs/Kconfig +++ b/subsys/fs/nvs/Kconfig @@ -5,7 +5,9 @@ config NVS bool "Non-volatile Storage" + depends on FLASH select CRC + select FLASH_PAGE_LAYOUT help Enable support of Non-volatile Storage. diff --git a/subsys/net/l2/openthread/Kconfig b/subsys/net/l2/openthread/Kconfig index aa7e03b8204..ef71e411b4e 100644 --- a/subsys/net/l2/openthread/Kconfig +++ b/subsys/net/l2/openthread/Kconfig @@ -16,7 +16,6 @@ menuconfig NET_L2_OPENTHREAD select OPENTHREAD imply FLASH - imply FLASH_PAGE_LAYOUT imply FLASH_MAP imply MPU_ALLOW_FLASH_WRITE imply NVS diff --git a/subsys/testsuite/Kconfig b/subsys/testsuite/Kconfig index 266b8533025..2ae331eb438 100644 --- a/subsys/testsuite/Kconfig +++ b/subsys/testsuite/Kconfig @@ -164,7 +164,6 @@ config TEST_FLASH_DRIVERS bool "Test flash drivers" depends on BOARD_QEMU_X86 select FLASH_HAS_DRIVER_ENABLED - select FLASH_HAS_PAGE_LAYOUT help This option will help test the flash drivers. This should be enabled only when using qemu_x86. diff --git a/tests/bluetooth/mesh/blob_io_flash/prj.conf b/tests/bluetooth/mesh/blob_io_flash/prj.conf index 1e7864aa05d..7db7efc16cd 100644 --- a/tests/bluetooth/mesh/blob_io_flash/prj.conf +++ b/tests/bluetooth/mesh/blob_io_flash/prj.conf @@ -1,6 +1,5 @@ CONFIG_ZTEST=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_FLASH_AREA_CHECK_INTEGRITY=y CONFIG_FLASH_SIMULATOR=y diff --git a/tests/bluetooth/mesh_shell/prj.conf b/tests/bluetooth/mesh_shell/prj.conf index 6535b77c3ab..9ed15616cab 100644 --- a/tests/bluetooth/mesh_shell/prj.conf +++ b/tests/bluetooth/mesh_shell/prj.conf @@ -11,7 +11,6 @@ CONFIG_SHELL_CMD_BUFF_SIZE=128 CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y CONFIG_SETTINGS=y diff --git a/tests/bluetooth/shell/log.conf b/tests/bluetooth/shell/log.conf index 6c278246e33..69a1d5d5533 100644 --- a/tests/bluetooth/shell/log.conf +++ b/tests/bluetooth/shell/log.conf @@ -35,7 +35,6 @@ CONFIG_LOG=y CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y CONFIG_SETTINGS=y diff --git a/tests/bluetooth/shell/prj.conf b/tests/bluetooth/shell/prj.conf index 185167de1d1..605cbc61c19 100644 --- a/tests/bluetooth/shell/prj.conf +++ b/tests/bluetooth/shell/prj.conf @@ -33,7 +33,6 @@ CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y CONFIG_SETTINGS=y diff --git a/tests/bsim/bluetooth/host/att/long_read/prj.conf b/tests/bsim/bluetooth/host/att/long_read/prj.conf index 1e5e8dc8b41..ddcef1bc3fe 100644 --- a/tests/bsim/bluetooth/host/att/long_read/prj.conf +++ b/tests/bsim/bluetooth/host/att/long_read/prj.conf @@ -18,7 +18,6 @@ CONFIG_BT_SMP=y CONFIG_BT_TESTING=y CONFIG_BT=y CONFIG_FLASH_MAP=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH=y CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP=n CONFIG_LOG_RUNTIME_FILTERING=y diff --git a/tests/bsim/bluetooth/host/att/open_close/prj.conf b/tests/bsim/bluetooth/host/att/open_close/prj.conf index f898c5238cc..bee886a30e2 100644 --- a/tests/bsim/bluetooth/host/att/open_close/prj.conf +++ b/tests/bsim/bluetooth/host/att/open_close/prj.conf @@ -18,7 +18,6 @@ CONFIG_BT_SMP=y CONFIG_BT_TESTING=y CONFIG_BT=y CONFIG_FLASH_MAP=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH=y CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP=n CONFIG_LOG_RUNTIME_FILTERING=y diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/prj.conf b/tests/bsim/bluetooth/host/gatt/ccc_store/prj.conf index 1fbddd5c271..7aec13ace8e 100644 --- a/tests/bsim/bluetooth/host/gatt/ccc_store/prj.conf +++ b/tests/bsim/bluetooth/host/gatt/ccc_store/prj.conf @@ -14,7 +14,6 @@ CONFIG_BT_SMP=y CONFIG_SETTINGS=y CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_NVS=y CONFIG_FLASH_MAP=y CONFIG_SETTINGS_NVS=y diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/prj_2.conf b/tests/bsim/bluetooth/host/gatt/ccc_store/prj_2.conf index fffdcbcf1cc..82fa0d0c155 100644 --- a/tests/bsim/bluetooth/host/gatt/ccc_store/prj_2.conf +++ b/tests/bsim/bluetooth/host/gatt/ccc_store/prj_2.conf @@ -14,7 +14,6 @@ CONFIG_BT_SMP=y CONFIG_SETTINGS=y CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_NVS=y CONFIG_FLASH_MAP=y CONFIG_SETTINGS_NVS=y diff --git a/tests/bsim/bluetooth/host/gatt/sc_indicate/prj.conf b/tests/bsim/bluetooth/host/gatt/sc_indicate/prj.conf index 7edaf36d10e..f2513b92356 100644 --- a/tests/bsim/bluetooth/host/gatt/sc_indicate/prj.conf +++ b/tests/bsim/bluetooth/host/gatt/sc_indicate/prj.conf @@ -12,7 +12,6 @@ CONFIG_BT_GATT_CLIENT=y CONFIG_SETTINGS=y CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_NVS=y CONFIG_FLASH_MAP=y CONFIG_SETTINGS_NVS=y diff --git a/tests/bsim/bluetooth/host/id/settings/prj.conf b/tests/bsim/bluetooth/host/id/settings/prj.conf index 4559ba6f8f9..99efcbc8966 100644 --- a/tests/bsim/bluetooth/host/id/settings/prj.conf +++ b/tests/bsim/bluetooth/host/id/settings/prj.conf @@ -7,7 +7,6 @@ CONFIG_LOG=y CONFIG_BT_ID_MAX=2 CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y CONFIG_SETTINGS=y diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/prj.conf b/tests/bsim/bluetooth/host/privacy/peripheral/prj.conf index 9113a44382b..d7295596ac3 100644 --- a/tests/bsim/bluetooth/host/privacy/peripheral/prj.conf +++ b/tests/bsim/bluetooth/host/privacy/peripheral/prj.conf @@ -13,7 +13,6 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=3 CONFIG_BT_ID_MAX=3 CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y CONFIG_SETTINGS=y diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/prj_rpa_expired.conf b/tests/bsim/bluetooth/host/privacy/peripheral/prj_rpa_expired.conf index dcab4bc5686..a357a38df39 100644 --- a/tests/bsim/bluetooth/host/privacy/peripheral/prj_rpa_expired.conf +++ b/tests/bsim/bluetooth/host/privacy/peripheral/prj_rpa_expired.conf @@ -13,7 +13,6 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=4 CONFIG_BT_ID_MAX=3 CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y CONFIG_SETTINGS=y diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/prj_rpa_sharing.conf b/tests/bsim/bluetooth/host/privacy/peripheral/prj_rpa_sharing.conf index 208efda9c7f..2c4195b169d 100644 --- a/tests/bsim/bluetooth/host/privacy/peripheral/prj_rpa_sharing.conf +++ b/tests/bsim/bluetooth/host/privacy/peripheral/prj_rpa_sharing.conf @@ -13,7 +13,6 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=3 CONFIG_BT_ID_MAX=3 CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y CONFIG_SETTINGS=y diff --git a/tests/bsim/bluetooth/host/security/ccc_update/prj.conf b/tests/bsim/bluetooth/host/security/ccc_update/prj.conf index 3d727bf31de..87cc06cde9e 100644 --- a/tests/bsim/bluetooth/host/security/ccc_update/prj.conf +++ b/tests/bsim/bluetooth/host/security/ccc_update/prj.conf @@ -16,7 +16,6 @@ CONFIG_BT_SMP=y CONFIG_SETTINGS=y CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_NVS=y CONFIG_FLASH_MAP=y CONFIG_SETTINGS_NVS=y diff --git a/tests/bsim/bluetooth/host/security/ccc_update/prj_2.conf b/tests/bsim/bluetooth/host/security/ccc_update/prj_2.conf index ce1300a7439..cab86865147 100644 --- a/tests/bsim/bluetooth/host/security/ccc_update/prj_2.conf +++ b/tests/bsim/bluetooth/host/security/ccc_update/prj_2.conf @@ -18,7 +18,6 @@ CONFIG_BT_SMP=y CONFIG_SETTINGS=y CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_NVS=y CONFIG_FLASH_MAP=y CONFIG_SETTINGS_NVS=y diff --git a/tests/bsim/bluetooth/host/security/security_changed_callback/prj.conf b/tests/bsim/bluetooth/host/security/security_changed_callback/prj.conf index abf1bd7ffb7..25422630f25 100644 --- a/tests/bsim/bluetooth/host/security/security_changed_callback/prj.conf +++ b/tests/bsim/bluetooth/host/security/security_changed_callback/prj.conf @@ -10,7 +10,6 @@ CONFIG_BT_PRIVACY=y CONFIG_SETTINGS=y CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_NVS=y CONFIG_FLASH_MAP=y CONFIG_SETTINGS_NVS=y diff --git a/tests/bsim/bluetooth/mesh/overlay_pst.conf b/tests/bsim/bluetooth/mesh/overlay_pst.conf index e02c0ec2b93..42c1d0d26ce 100644 --- a/tests/bsim/bluetooth/mesh/overlay_pst.conf +++ b/tests/bsim/bluetooth/mesh/overlay_pst.conf @@ -1,7 +1,6 @@ CONFIG_SETTINGS=y CONFIG_BT_SETTINGS=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y diff --git a/tests/subsys/fs/fcb/prj.conf b/tests/subsys/fs/fcb/prj.conf index c30a352a0e4..7308ffdbf9c 100644 --- a/tests/subsys/fs/fcb/prj.conf +++ b/tests/subsys/fs/fcb/prj.conf @@ -1,7 +1,6 @@ CONFIG_ZTEST=y CONFIG_STDOUT_CONSOLE=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_FCB=y CONFIG_FCB_ALLOW_FIXED_ENDMARKER=y diff --git a/tests/subsys/fs/littlefs/prj.conf b/tests/subsys/fs/littlefs/prj.conf index de33b272ae6..094bf4a9102 100644 --- a/tests/subsys/fs/littlefs/prj.conf +++ b/tests/subsys/fs/littlefs/prj.conf @@ -13,7 +13,6 @@ CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192 CONFIG_FLASH=y CONFIG_FLASH_MAP=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_ZTEST=y CONFIG_ZTEST_STACK_SIZE=4096 diff --git a/tests/subsys/fs/multi-fs/prj.conf b/tests/subsys/fs/multi-fs/prj.conf index 287f0363dca..9e8871e074b 100644 --- a/tests/subsys/fs/multi-fs/prj.conf +++ b/tests/subsys/fs/multi-fs/prj.conf @@ -1,6 +1,5 @@ CONFIG_FLASH=y CONFIG_FLASH_MAP=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FILE_SYSTEM=y CONFIG_FILE_SYSTEM_LITTLEFS=y CONFIG_LOG=y diff --git a/tests/subsys/fs/multi-fs/prj_fs_shell.conf b/tests/subsys/fs/multi-fs/prj_fs_shell.conf index 327e2b4f2fb..0f796e27515 100644 --- a/tests/subsys/fs/multi-fs/prj_fs_shell.conf +++ b/tests/subsys/fs/multi-fs/prj_fs_shell.conf @@ -1,6 +1,5 @@ CONFIG_FLASH=y CONFIG_FLASH_MAP=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FILE_SYSTEM=y CONFIG_FILE_SYSTEM_LITTLEFS=y CONFIG_LOG=y diff --git a/tests/subsys/fs/nvs/prj.conf b/tests/subsys/fs/nvs/prj.conf index 7d7f4aec2e9..75740e3df33 100644 --- a/tests/subsys/fs/nvs/prj.conf +++ b/tests/subsys/fs/nvs/prj.conf @@ -4,7 +4,6 @@ CONFIG_STDOUT_CONSOLE=y CONFIG_FLASH=y CONFIG_FLASH_MAP=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_NVS=y CONFIG_LOG=y diff --git a/tests/subsys/settings/fcb/prj.conf b/tests/subsys/settings/fcb/prj.conf index c0091de22ed..851107aa45f 100644 --- a/tests/subsys/settings/fcb/prj.conf +++ b/tests/subsys/settings/fcb/prj.conf @@ -2,7 +2,6 @@ CONFIG_ZTEST=y CONFIG_ZTEST_STACK_SIZE=2048 CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_FCB=y diff --git a/tests/subsys/settings/fcb_init/prj.conf b/tests/subsys/settings/fcb_init/prj.conf index 9652f2c467c..49e4e03c180 100644 --- a/tests/subsys/settings/fcb_init/prj.conf +++ b/tests/subsys/settings/fcb_init/prj.conf @@ -1,6 +1,5 @@ CONFIG_ZTEST=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_FCB=y diff --git a/tests/subsys/settings/file/prj.conf b/tests/subsys/settings/file/prj.conf index 9a61b45661d..bf36966b2f3 100644 --- a/tests/subsys/settings/file/prj.conf +++ b/tests/subsys/settings/file/prj.conf @@ -3,7 +3,6 @@ CONFIG_ZTEST=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_ZTEST_STACK_SIZE=4096 diff --git a/tests/subsys/settings/functional/fcb/prj.conf b/tests/subsys/settings/functional/fcb/prj.conf index 795a225d7fd..e67348a875a 100644 --- a/tests/subsys/settings/functional/fcb/prj.conf +++ b/tests/subsys/settings/functional/fcb/prj.conf @@ -1,6 +1,5 @@ CONFIG_ZTEST=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_FCB=y diff --git a/tests/subsys/settings/functional/file/prj.conf b/tests/subsys/settings/functional/file/prj.conf index fe506f01d99..dd6a82ce321 100644 --- a/tests/subsys/settings/functional/file/prj.conf +++ b/tests/subsys/settings/functional/file/prj.conf @@ -2,7 +2,6 @@ CONFIG_ZTEST=y CONFIG_ZTEST_STACK_SIZE=2048 CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_FILE_SYSTEM=y diff --git a/tests/subsys/settings/functional/nvs/prj.conf b/tests/subsys/settings/functional/nvs/prj.conf index 2466686f555..1ab9abd5576 100644 --- a/tests/subsys/settings/functional/nvs/prj.conf +++ b/tests/subsys/settings/functional/nvs/prj.conf @@ -1,6 +1,5 @@ CONFIG_ZTEST=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y diff --git a/tests/subsys/settings/nvs/prj.conf b/tests/subsys/settings/nvs/prj.conf index 2466686f555..1ab9abd5576 100644 --- a/tests/subsys/settings/nvs/prj.conf +++ b/tests/subsys/settings/nvs/prj.conf @@ -1,6 +1,5 @@ CONFIG_ZTEST=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y diff --git a/tests/subsys/storage/stream/stream_flash/prj.conf b/tests/subsys/storage/stream/stream_flash/prj.conf index 6e5811b8fdc..99684390afa 100644 --- a/tests/subsys/storage/stream/stream_flash/prj.conf +++ b/tests/subsys/storage/stream/stream_flash/prj.conf @@ -6,7 +6,6 @@ CONFIG_ZTEST=y CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_NVS=y CONFIG_SETTINGS=y