diff --git a/boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto.dts b/boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto.dts index 968fbed44a..3853bc190a 100644 --- a/boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto.dts +++ b/boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto.dts @@ -72,13 +72,10 @@ * The final 16 KiB is reserved for the application * and is used by NFFS if enabled. */ - -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) storage_partition: partition@3c000 { label = "storage"; reg = <0x0003c000 0x00004000>; }; -#endif }; }; diff --git a/boards/arm/adafruit_trinket_m0/adafruit_trinket_m0.dts b/boards/arm/adafruit_trinket_m0/adafruit_trinket_m0.dts index bcd8b4f79a..8a32f30bc7 100644 --- a/boards/arm/adafruit_trinket_m0/adafruit_trinket_m0.dts +++ b/boards/arm/adafruit_trinket_m0/adafruit_trinket_m0.dts @@ -87,13 +87,10 @@ * The final 16 KiB is reserved for the application * and is used by NFFS if enabled. */ - -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) storage_partition: partition@3c000 { label = "storage"; reg = <0x0003c000 0x00004000>; }; -#endif }; }; diff --git a/boards/arm/arduino_zero/arduino_zero.dts b/boards/arm/arduino_zero/arduino_zero.dts index b79c688aef..aa43056a5a 100644 --- a/boards/arm/arduino_zero/arduino_zero.dts +++ b/boards/arm/arduino_zero/arduino_zero.dts @@ -75,13 +75,10 @@ * The final 16 KiB is reserved for the application * and is used by NFFS if enabled. */ - -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) storage_partition: partition@3c000 { label = "storage"; reg = <0x0003c000 0x00004000>; }; -#endif }; }; diff --git a/boards/arm/atsamd20_xpro/atsamd20_xpro.dts b/boards/arm/atsamd20_xpro/atsamd20_xpro.dts index eb1319b4d0..3823f32081 100644 --- a/boards/arm/atsamd20_xpro/atsamd20_xpro.dts +++ b/boards/arm/atsamd20_xpro/atsamd20_xpro.dts @@ -72,12 +72,9 @@ * The final 16 KiB is reserved for the application * and is used by NFFS if enabled. */ - -#if defined(CONFIG_FS_FLASH_MAP_STORAGE) storage_partition: partition@3c000 { label = "storage"; reg = <0x0003c000 0x00004000>; }; -#endif }; }; diff --git a/boards/arm/bbc_microbit/bbc_microbit.dts b/boards/arm/bbc_microbit/bbc_microbit.dts index e97550c953..2f6d56b184 100644 --- a/boards/arm/bbc_microbit/bbc_microbit.dts +++ b/boards/arm/bbc_microbit/bbc_microbit.dts @@ -94,12 +94,9 @@ label = "image-scratch"; reg = <0x0003c000 0x2000>; }; - -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) storage_partition: partition@3e000 { label = "storage"; reg = <0x0003e000 0x00002000>; }; -#endif }; }; diff --git a/boards/arm/frdm_k64f/frdm_k64f.dts b/boards/arm/frdm_k64f/frdm_k64f.dts index d7a1a75b85..de09269c46 100644 --- a/boards/arm/frdm_k64f/frdm_k64f.dts +++ b/boards/arm/frdm_k64f/frdm_k64f.dts @@ -145,12 +145,10 @@ arduino_serial: &uart3 {}; * 0x0001ffff (sectors 16-31) is reserved for use * by the application. */ -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) - storage_partition: partition@1e000 { + storage_partition: partition@1e000 { label = "storage"; reg = <0x0001e000 0x00002000>; }; -#endif slot0_partition: partition@20000 { label = "image-0"; diff --git a/boards/arm/nrf51_pca10028/nrf51_pca10028.dts b/boards/arm/nrf51_pca10028/nrf51_pca10028.dts index e36dea212c..7dbbe27ba7 100644 --- a/boards/arm/nrf51_pca10028/nrf51_pca10028.dts +++ b/boards/arm/nrf51_pca10028/nrf51_pca10028.dts @@ -145,12 +145,9 @@ label = "image-scratch"; reg = <0x0003c000 0x2000>; }; - -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) storage_partition: partition@3e000 { label = "storage"; reg = <0x0003e000 0x00002000>; }; -#endif }; }; diff --git a/boards/arm/nrf52810_pca10040/nrf52810_pca10040.dts b/boards/arm/nrf52810_pca10040/nrf52810_pca10040.dts index e3a1d6a19f..2a84cca1e0 100644 --- a/boards/arm/nrf52810_pca10040/nrf52810_pca10040.dts +++ b/boards/arm/nrf52810_pca10040/nrf52810_pca10040.dts @@ -134,12 +134,9 @@ label = "image-scratch"; reg = <0x00026000 0x3000>; }; - -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) storage_partition: partition@29000 { label = "storage"; reg = <0x00029000 0x00007000>; }; -#endif }; }; diff --git a/boards/arm/nrf52832_mdk/nrf52832_mdk.dts b/boards/arm/nrf52832_mdk/nrf52832_mdk.dts index bd615264bb..afb1f1d839 100644 --- a/boards/arm/nrf52832_mdk/nrf52832_mdk.dts +++ b/boards/arm/nrf52832_mdk/nrf52832_mdk.dts @@ -113,12 +113,9 @@ label = "image-scratch"; reg = <0x00070000 0xa000>; }; - -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) storage_partition: partition@7a000 { label = "storage"; reg = <0x0007a000 0x00006000>; }; -#endif }; }; diff --git a/boards/arm/nrf52840_mdk/nrf52840_mdk.dts b/boards/arm/nrf52840_mdk/nrf52840_mdk.dts index de93c11f10..cf09e68c96 100644 --- a/boards/arm/nrf52840_mdk/nrf52840_mdk.dts +++ b/boards/arm/nrf52840_mdk/nrf52840_mdk.dts @@ -115,13 +115,10 @@ label = "image-scratch"; reg = <0x000de000 0x0001e000>; }; - -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) storage_partition: partition@fc000 { label = "storage"; reg = <0x000fc000 0x00004000>; }; -#endif }; }; diff --git a/boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts b/boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts index 3ec412268b..4d528cfc5a 100644 --- a/boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts +++ b/boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts @@ -164,13 +164,10 @@ label = "image-scratch"; reg = <0x000de000 0x0001e000>; }; - -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) storage_partition: partition@fc000 { label = "storage"; reg = <0x000fc000 0x00004000>; }; -#endif }; }; diff --git a/boards/arm/nrf52840_pca10059/nrf52840_pca10059.dts b/boards/arm/nrf52840_pca10059/nrf52840_pca10059.dts index aeeebc2951..ef3cabaee3 100644 --- a/boards/arm/nrf52840_pca10059/nrf52840_pca10059.dts +++ b/boards/arm/nrf52840_pca10059/nrf52840_pca10059.dts @@ -140,13 +140,10 @@ label = "image-scratch"; reg = <0x000c1000 0x0001f000>; }; - -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) storage_partition: partition@fa000 { label = "storage"; reg = <0x000fa000 0x00004000>; }; -#endif }; }; diff --git a/boards/arm/nrf52_adafruit_feather/nrf52_adafruit_feather.dts b/boards/arm/nrf52_adafruit_feather/nrf52_adafruit_feather.dts index 501d48f93a..e2c821d5f0 100644 --- a/boards/arm/nrf52_adafruit_feather/nrf52_adafruit_feather.dts +++ b/boards/arm/nrf52_adafruit_feather/nrf52_adafruit_feather.dts @@ -96,12 +96,9 @@ label = "image-scratch"; reg = <0x00070000 0xa000>; }; - -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) storage_partition: partition@7a000 { label = "storage"; reg = <0x0007a000 0x00006000>; }; -#endif }; }; diff --git a/boards/arm/nrf52_blenano2/nrf52_blenano2.dts b/boards/arm/nrf52_blenano2/nrf52_blenano2.dts index 72a203a635..017c035b84 100644 --- a/boards/arm/nrf52_blenano2/nrf52_blenano2.dts +++ b/boards/arm/nrf52_blenano2/nrf52_blenano2.dts @@ -82,12 +82,9 @@ label = "image-scratch"; reg = <0x00070000 0xD000>; }; - -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) storage_partition: partition@7D000 { label = "storage"; reg = <0x0007D000 0x00004000>; }; -#endif }; }; diff --git a/boards/arm/nrf52_pca10040/nrf52_pca10040.dts b/boards/arm/nrf52_pca10040/nrf52_pca10040.dts index 140dc8d499..8adab8ac92 100644 --- a/boards/arm/nrf52_pca10040/nrf52_pca10040.dts +++ b/boards/arm/nrf52_pca10040/nrf52_pca10040.dts @@ -154,12 +154,9 @@ label = "image-scratch"; reg = <0x00070000 0xa000>; }; - -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) storage_partition: partition@7a000 { label = "storage"; reg = <0x0007a000 0x00006000>; }; -#endif }; }; diff --git a/boards/arm/nrf52_pca20020/nrf52_pca20020.dts b/boards/arm/nrf52_pca20020/nrf52_pca20020.dts index 2a37f8076b..674ec6be59 100644 --- a/boards/arm/nrf52_pca20020/nrf52_pca20020.dts +++ b/boards/arm/nrf52_pca20020/nrf52_pca20020.dts @@ -151,12 +151,9 @@ * by the application. If enabled, partition for NFFS * will be created in this area. */ - -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) storage_partition: partition@7a000 { label = "storage"; reg = <0x0007a000 0x00006000>; }; -#endif }; }; diff --git a/boards/arm/nrf52_sparkfun/nrf52_sparkfun.dts b/boards/arm/nrf52_sparkfun/nrf52_sparkfun.dts index b0a37aa440..c87a86d294 100644 --- a/boards/arm/nrf52_sparkfun/nrf52_sparkfun.dts +++ b/boards/arm/nrf52_sparkfun/nrf52_sparkfun.dts @@ -85,12 +85,9 @@ label = "image-scratch"; reg = <0x00070000 0xa000>; }; - -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) storage_partition: partition@7a000 { label = "storage"; reg = <0x0007a000 0x00006000>; }; -#endif }; }; diff --git a/boards/arm/nucleo_l432kc/nucleo_l432kc.dts b/boards/arm/nucleo_l432kc/nucleo_l432kc.dts index 2e410f8c45..4e4a03a697 100644 --- a/boards/arm/nucleo_l432kc/nucleo_l432kc.dts +++ b/boards/arm/nucleo_l432kc/nucleo_l432kc.dts @@ -72,7 +72,6 @@ #address-cells = <1>; #size-cells = <1>; -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) /* * Reserve the final 16 KiB for the application. */ @@ -80,6 +79,5 @@ label = "storage"; reg = <0x0003c000 0x00004000>; }; -#endif }; }; diff --git a/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi.dts b/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi.dts index fca372986f..6e21729d5c 100644 --- a/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi.dts +++ b/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi.dts @@ -105,12 +105,10 @@ arduino_serial: &usart3 {}; #address-cells = <1>; #size-cells = <1>; -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) /* Reserve last 16KiB for property storage */ storage_partition: partition@1FB000 { label = "storage"; reg = <0x001FB000 0x00004000>; }; -#endif }; }; diff --git a/boards/arm/reel_board/reel_board.dts b/boards/arm/reel_board/reel_board.dts index 3b3e573186..3f4e576f00 100644 --- a/boards/arm/reel_board/reel_board.dts +++ b/boards/arm/reel_board/reel_board.dts @@ -154,12 +154,10 @@ reg = <0x000de000 0x0001e000>; }; -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) storage_partition: partition@fc000 { label = "storage"; reg = <0x000fc000 0x00004000>; }; -#endif }; }; diff --git a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts b/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts index a86aba3bea..53295f41ef 100644 --- a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts +++ b/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts @@ -67,13 +67,10 @@ label = "image-scratch"; reg = <0x000de000 0x0001e000>; }; - -#if defined(CONFIG_FS_FLASH_STORAGE_PARTITION) storage_partition: partition@fc000 { label = "storage"; reg = <0x000fc000 0x00004000>; }; -#endif }; };