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 <dominik.ermel@nordicsemi.no>
2024-04-03 17:05:32 +02:00 · 2024-04-03 17:05:32 +02:00 · 5a0ecb9641
commit 5a0ecb9641
parent 37dfafe3f4
57 changed files with 3 additions and 55 deletions
--- 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
--- 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
--- 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) || \
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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.

--- 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.

--- 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
--- 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.
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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

--- 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
--- 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

--- 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
--- 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

--- 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

--- 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