michaelh/zephyr
1
0
Fork 0
Code Releases Activity

flash: Move dependency on FLASH_PAGE_LAYOUT where it belongs

Browse source 
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>
This commit is contained in:
Dominik Ermel 2024-04-03 17:05:32 +02:00 • committed by Carles Cufí
commit 5a0ecb9641
57 changed files with 3 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/bluetooth/mesh/blob_io_flash/prj.conf
View file

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

1
tests/bluetooth/mesh_shell/prj.conf
View file

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

1
tests/bluetooth/shell/log.conf
View file

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

1
tests/bluetooth/shell/prj.conf
View file

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

1
tests/bsim/bluetooth/host/att/long_read/prj.conf
View file

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

1
tests/bsim/bluetooth/host/att/open_close/prj.conf
View file

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

1
tests/bsim/bluetooth/host/gatt/ccc_store/prj.conf
View file

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

1
tests/bsim/bluetooth/host/gatt/ccc_store/prj_2.conf
View file

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

1
tests/bsim/bluetooth/host/gatt/sc_indicate/prj.conf
View file

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

1
tests/bsim/bluetooth/host/id/settings/prj.conf
View file

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

1
tests/bsim/bluetooth/host/privacy/peripheral/prj.conf
View file

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

1
tests/bsim/bluetooth/host/privacy/peripheral/prj_rpa_expired.conf
View file

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

1
tests/bsim/bluetooth/host/privacy/peripheral/prj_rpa_sharing.conf
View file

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

1
tests/bsim/bluetooth/host/security/ccc_update/prj.conf
View file

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

1
tests/bsim/bluetooth/host/security/ccc_update/prj_2.conf
View file

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

1
tests/bsim/bluetooth/host/security/security_changed_callback/prj.conf
View file

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

1
tests/bsim/bluetooth/mesh/overlay_pst.conf
View file

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

1
tests/subsys/fs/fcb/prj.conf
View file

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

1
tests/subsys/fs/littlefs/prj.conf
View file

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

1
tests/subsys/fs/multi-fs/prj.conf
View file

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

1
tests/subsys/fs/multi-fs/prj_fs_shell.conf
View file

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

1
tests/subsys/fs/nvs/prj.conf
View file

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

1
tests/subsys/settings/fcb/prj.conf
View file

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

1
tests/subsys/settings/fcb_init/prj.conf
View file

@ -1,6 +1,5 @@
CONFIG_ZTEST=y
CONFIG_FLASH=y
CONFIG_FLASH_PAGE_LAYOUT=y
CONFIG_FLASH_MAP=y
CONFIG_FCB=y

1
tests/subsys/settings/file/prj.conf
View file

@ -3,7 +3,6 @@
CONFIG_ZTEST=y
CONFIG_FLASH=y
CONFIG_FLASH_PAGE_LAYOUT=y
CONFIG_FLASH_MAP=y
CONFIG_ZTEST_STACK_SIZE=4096

1
tests/subsys/settings/functional/fcb/prj.conf
View file

@ -1,6 +1,5 @@
CONFIG_ZTEST=y
CONFIG_FLASH=y
CONFIG_FLASH_PAGE_LAYOUT=y
CONFIG_FLASH_MAP=y
CONFIG_FCB=y

1
tests/subsys/settings/functional/file/prj.conf
View file

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

1
tests/subsys/settings/functional/nvs/prj.conf
View file

@ -1,6 +1,5 @@
CONFIG_ZTEST=y
CONFIG_FLASH=y
CONFIG_FLASH_PAGE_LAYOUT=y
CONFIG_FLASH_MAP=y
CONFIG_NVS=y

1
tests/subsys/settings/nvs/prj.conf
View file

@ -1,6 +1,5 @@
CONFIG_ZTEST=y
CONFIG_FLASH=y
CONFIG_FLASH_PAGE_LAYOUT=y
CONFIG_FLASH_MAP=y
CONFIG_NVS=y

1
tests/subsys/storage/stream/stream_flash/prj.conf
View file

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