michaelh/zephyr
1
0
Fork 0
Code Releases Activity

subsys: fs: fix generic storage partition selection

Browse source 
FS_FLASH_MAP_STORAGE keyword enables the storage partition,
but it was depend on flash_map module which is unused by
NFFS. This patch makes it independent thanks
to it is possible to enable the storage partition
without flash_map module.

FS_FLASH_MAP_STORAGE was renamed to
CONFIG_FS_FLASH_STORAGE_PARTITION
as it is independent for flash_map.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
This commit is contained in:
Andrzej Puzdrowski 2018-05-04 09:25:18 +02:00 • committed by Anas Nashif
commit 4954fe06f2
13 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto.dts
View file

@ -56,7 +56,7 @@
* and is used by NFFS if enabled. * and is used by NFFS if enabled.
*/ */
#if defined(CONFIG_FS_FLASH_MAP_STORAGE) #if defined(CONFIG_FS_FLASH_STORAGE_PARTITION)
storage_partition: partition@3c000 { storage_partition: partition@3c000 {
label = "storage"; label = "storage";
reg = <0x0003c000 0x00004000>; reg = <0x0003c000 0x00004000>;

2
boards/arm/adafruit_trinket_m0/adafruit_trinket_m0.dts
View file

@ -69,7 +69,7 @@
* and is used by NFFS if enabled. * and is used by NFFS if enabled.
*/ */
#if defined(CONFIG_FS_FLASH_MAP_STORAGE) #if defined(CONFIG_FS_FLASH_STORAGE_PARTITION)
storage_partition: partition@3c000 { storage_partition: partition@3c000 {
label = "storage"; label = "storage";
reg = <0x0003c000 0x00004000>; reg = <0x0003c000 0x00004000>;

2
boards/arm/arduino_zero/arduino_zero.dts
View file

@ -46,7 +46,7 @@
* and is used by NFFS if enabled. * and is used by NFFS if enabled.
*/ */
#if defined(CONFIG_FS_FLASH_MAP_STORAGE) #if defined(CONFIG_FS_FLASH_STORAGE_PARTITION)
storage_partition: partition@3c000 { storage_partition: partition@3c000 {
label = "storage"; label = "storage";
reg = <0x0003c000 0x00004000>; reg = <0x0003c000 0x00004000>;

2
boards/arm/bbc_microbit/bbc_microbit.dts
View file

@ -55,7 +55,7 @@
reg = <0x0003c000 0x2000>; reg = <0x0003c000 0x2000>;
}; };
#if defined(CONFIG_FS_FLASH_MAP_STORAGE) #if defined(CONFIG_FS_FLASH_STORAGE_PARTITION)
storage_partition: partition@3e000 { storage_partition: partition@3e000 {
label = "storage"; label = "storage";
reg = <0x0003e000 0x00002000>; reg = <0x0003e000 0x00002000>;

2
boards/arm/nrf51_pca10028/nrf51_pca10028.dts
View file

@ -59,7 +59,7 @@
reg = <0x0003c000 0x2000>; reg = <0x0003c000 0x2000>;
}; };
#if defined(CONFIG_FS_FLASH_MAP_STORAGE) #if defined(CONFIG_FS_FLASH_STORAGE_PARTITION)
storage_partition: partition@3e000 { storage_partition: partition@3e000 {
label = "storage"; label = "storage";
reg = <0x0003e000 0x00002000>; reg = <0x0003e000 0x00002000>;

2
boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts
View file

@ -60,7 +60,7 @@
reg = <0x000de000 0x0001e000>; reg = <0x000de000 0x0001e000>;
}; };
#if defined(CONFIG_FS_FLASH_MAP_STORAGE) #if defined(CONFIG_FS_FLASH_STORAGE_PARTITION)
storage_partition: partition@fc000 { storage_partition: partition@fc000 {
label = "storage"; label = "storage";
reg = <0x000fc000 0x00004000>; reg = <0x000fc000 0x00004000>;

2
boards/arm/nrf52_pca10040/nrf52_pca10040.dts
View file

@ -60,7 +60,7 @@
reg = <0x00070000 0xa000>; reg = <0x00070000 0xa000>;
}; };
#if defined(CONFIG_FS_FLASH_MAP_STORAGE) #if defined(CONFIG_FS_FLASH_STORAGE_PARTITION)
storage_partition: partition@7a000 { storage_partition: partition@7a000 {
label = "storage"; label = "storage";
reg = <0x0007a000 0x00006000>; reg = <0x0007a000 0x00006000>;

2
boards/arm/nrf52_pca20020/nrf52_pca20020.dts
View file

@ -100,7 +100,7 @@
* will be created in this area. * will be created in this area.
*/ */
#if defined(CONFIG_FS_FLASH_MAP_STORAGE) #if defined(CONFIG_FS_FLASH_STORAGE_PARTITION)
storage_partition: partition@7a000 { storage_partition: partition@7a000 {
label = "storage"; label = "storage";
reg = <0x0007a000 0x00006000>; reg = <0x0007a000 0x00006000>;

2
boards/arm/nrf52_sparkfun/nrf52_sparkfun.dts
View file

@ -53,7 +53,7 @@
reg = <0x00070000 0xa000>; reg = <0x00070000 0xa000>;
}; };
#if defined(CONFIG_FS_FLASH_MAP_STORAGE) #if defined(CONFIG_FS_FLASH_STORAGE_PARTITION)
storage_partition: partition@7a000 { storage_partition: partition@7a000 {
label = "storage"; label = "storage";
reg = <0x0007a000 0x00006000>; reg = <0x0007a000 0x00006000>;

2
samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts
View file

@ -52,7 +52,7 @@
reg = <0x000de000 0x0001e000>; reg = <0x000de000 0x0001e000>;
}; };
#if defined(CONFIG_FS_FLASH_MAP_STORAGE) #if defined(CONFIG_FS_FLASH_STORAGE_PARTITION)
storage_partition: partition@fc000 { storage_partition: partition@fc000 {
label = "storage"; label = "storage";
reg = <0x000fc000 0x00004000>; reg = <0x000fc000 0x00004000>;

5
subsys/fs/Kconfig
View file

@ -5,9 +5,8 @@
# #
# Hidden. Automatically selected by file systems or FCB that need it # Hidden. Automatically selected by file systems or FCB that need it
config FS_FLASH_MAP_STORAGE config FS_FLASH_STORAGE_PARTITION
bool bool
depends on FLASH_MAP
default n default n
menu "File Systems" menu "File Systems"
@ -43,7 +42,7 @@ config FAT_FILESYSTEM_ELM
config FILE_SYSTEM_NFFS config FILE_SYSTEM_NFFS
bool "NFFS file system support" bool "NFFS file system support"
select FLASH_PAGE_LAYOUT select FLASH_PAGE_LAYOUT
select FS_FLASH_MAP_STORAGE select FS_FLASH_STORAGE_PARTITION
help help
Enables NFFS file system support. Enables NFFS file system support.
Note: NFFS requires 1-byte unaligned access to flash thus it Note: NFFS requires 1-byte unaligned access to flash thus it

2
subsys/fs/fcb/Kconfig
View file

@ -14,6 +14,6 @@ config FCB
prompt "Flash Circular Buffer support" prompt "Flash Circular Buffer support"
default n default n
depends on FLASH_MAP depends on FLASH_MAP
select FS_FLASH_MAP_STORAGE select FS_FLASH_STORAGE_PARTITION
help help
Enable support of Flash Circular Buffer. Enable support of Flash Circular Buffer.

2
subsys/storage/flash_map/flash_map_default.c
View file

@ -41,7 +41,7 @@ const struct flash_area default_flash_map[] = {
.fa_size = FLASH_AREA_IMAGE_SCRATCH_SIZE, .fa_size = FLASH_AREA_IMAGE_SCRATCH_SIZE,
}, },
#ifdef CONFIG_FS_FLASH_MAP_STORAGE #ifdef CONFIG_FS_FLASH_STORAGE_PARTITION
/* FLASH_AREA_STORAGE */ /* FLASH_AREA_STORAGE */
{ {
.fa_id = 4, .fa_id = 4,