This is an automated email from the ASF dual-hosted git repository.

kasjer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git

commit 195614250bb71d149049e8514853f09d0409d94d
Author: Jerzy Kasenberg <[email protected]>
AuthorDate: Mon Oct 12 08:18:52 2026 +0200

    hw/bsp: Set flash areas only when owning package is present
    
    NFFS_FLASH_AREA, CONFIG_FCB_FLASH_AREA and REBOOT_LOG_FLASH_AREA were
    set in syscfg.vals of most BSPs.  When fs/nffs, sys/config with FCB
    storage or sys/reboot with FCB log were not included in build (most of
    the time) newt reported warning:
    
        Ignoring override of undefined settings:
            CONFIG_FCB_FLASH_AREA
            NFFS_FLASH_AREA
            REBOOT_LOG_FLASH_AREA
    
    Now values are set in syscfg.vals.NFFS,
    syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)' and
    syscfg.vals.REBOOT_LOG_FCB sections so they are applied only when
    the package that defines the setting is in the build.  Config gate
    matches the condition under which sys/config defines
    CONFIG_FCB_FLASH_AREA.
    
    Assisted-by: Claude:claude-fable-5-1
    Signed-off-by: Jerzy Kasenberg <[email protected]>
---
 hw/bsp/ada_feather_nrf52/syscfg.yml          | 12 +++++++++---
 hw/bsp/ada_feather_stm32f405/syscfg.yml      | 12 +++++++++---
 hw/bsp/apollo2_evb/syscfg.yml                | 14 +++++++++-----
 hw/bsp/apollo3_evb/syscfg.yml                | 12 +++++++++---
 hw/bsp/arduino_primo_nrf52/syscfg.yml        | 12 +++++++++---
 hw/bsp/arduino_zero/syscfg.yml               | 12 +++++++++---
 hw/bsp/b-l072z-lrwan1/syscfg.yml             | 12 +++++++++---
 hw/bsp/b-l475e-iot01a/syscfg.yml             | 12 +++++++++---
 hw/bsp/bbc_microbit/syscfg.yml               | 12 +++++++++---
 hw/bsp/black_vet6/syscfg.yml                 | 12 +++++++++---
 hw/bsp/blackpill401cc/syscfg.yml             | 12 +++++++++---
 hw/bsp/blackpill411ce/syscfg.yml             | 12 +++++++++---
 hw/bsp/ble400/syscfg.yml                     | 12 +++++++++---
 hw/bsp/bluepill/syscfg.yml                   | 12 +++++++++---
 hw/bsp/bmd200/syscfg.yml                     | 12 +++++++++---
 hw/bsp/bmd300eval/syscfg.yml                 | 12 +++++++++---
 hw/bsp/calliope_mini/syscfg.yml              | 12 +++++++++---
 hw/bsp/dialog_da14695-dk-usb/syscfg.yml      | 12 +++++++++---
 hw/bsp/dialog_da1469x-dk-pro/syscfg.yml      | 12 +++++++++---
 hw/bsp/dwm1001-dev/syscfg.yml                | 12 +++++++++---
 hw/bsp/fanstel-ev-bt840/syscfg.yml           | 12 +++++++++---
 hw/bsp/fanstel_ev_bt40e/net/syscfg.yml       | 12 +++++++++---
 hw/bsp/fanstel_ev_bt40e/syscfg.yml           | 12 +++++++++---
 hw/bsp/frdm-k64f/syscfg.yml                  | 12 +++++++++---
 hw/bsp/frdm-k82f/syscfg.yml                  | 12 +++++++++---
 hw/bsp/hifive1/syscfg.yml                    |  8 ++++++--
 hw/bsp/lpcxpresso55s28/syscfg.yml            | 12 +++++++++---
 hw/bsp/native-armv7/syscfg.yml               | 12 +++++++++---
 hw/bsp/native/syscfg.yml                     | 12 +++++++++---
 hw/bsp/nina-b1/syscfg.yml                    | 12 +++++++++---
 hw/bsp/nordic_pca10028-16k/syscfg.yml        | 12 +++++++++---
 hw/bsp/nordic_pca10028/syscfg.yml            | 12 +++++++++---
 hw/bsp/nordic_pca10040/syscfg.yml            | 12 +++++++++---
 hw/bsp/nordic_pca10056/syscfg.yml            | 12 +++++++++---
 hw/bsp/nordic_pca10059/syscfg.yml            | 12 +++++++++---
 hw/bsp/nordic_pca10090/syscfg.yml            | 12 +++++++++---
 hw/bsp/nordic_pca10095/syscfg.yml            | 12 +++++++++---
 hw/bsp/nordic_pca10095_net/syscfg.yml        | 12 +++++++++---
 hw/bsp/nordic_pca10121/net/syscfg.yml        | 12 +++++++++---
 hw/bsp/nordic_pca10121/syscfg.yml            | 12 +++++++++---
 hw/bsp/nordic_pca20020/syscfg.yml            | 12 +++++++++---
 hw/bsp/nordic_thingy53/syscfg.yml            | 12 +++++++++---
 hw/bsp/nrf51-arduino_101/syscfg.yml          | 12 +++++++++---
 hw/bsp/nrf51-blenano/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-f030r8/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-f072rb/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-f103rb/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-f303k8/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-f303re/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-f401re/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-f411re/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-f413zh/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-f439zi/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-f746zg/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-f767zi/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-g0b1re/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-g491re/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-h563zi/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-h723zg/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-h753zi/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-l073rz/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-l476rg/syscfg.yml              | 12 +++++++++---
 hw/bsp/nucleo-u575zi-q/syscfg.yml            | 12 +++++++++---
 hw/bsp/olimex-p103/syscfg.yml                | 12 +++++++++---
 hw/bsp/olimex-pic32-emz64/syscfg.yml         | 12 +++++++++---
 hw/bsp/olimex-pic32-hmz144/syscfg.yml        | 12 +++++++++---
 hw/bsp/olimex_stm32-e407_devboard/syscfg.yml | 12 +++++++++---
 hw/bsp/p-nucleo-wb55-usbdongle/syscfg.yml    | 12 +++++++++---
 hw/bsp/p-nucleo-wb55/syscfg.yml              | 12 +++++++++---
 hw/bsp/pinetime/syscfg.yml                   | 12 +++++++++---
 hw/bsp/puckjs/syscfg.yml                     | 12 +++++++++---
 hw/bsp/rb-blend2/syscfg.yml                  | 12 +++++++++---
 hw/bsp/rb-nano2/syscfg.yml                   | 12 +++++++++---
 hw/bsp/reel_board/syscfg.yml                 | 12 +++++++++---
 hw/bsp/ruuvitag_rev_b/syscfg.yml             | 12 +++++++++---
 hw/bsp/stm32f3discovery/syscfg.yml           | 12 +++++++++---
 hw/bsp/stm32f411discovery/syscfg.yml         | 12 +++++++++---
 hw/bsp/stm32f429discovery/syscfg.yml         | 12 +++++++++---
 hw/bsp/stm32f4discovery/syscfg.yml           | 12 +++++++++---
 hw/bsp/stm32f7discovery/syscfg.yml           | 12 +++++++++---
 hw/bsp/stm32l152discovery/syscfg.yml         | 12 +++++++++---
 hw/bsp/telee02/syscfg.yml                    | 12 +++++++++---
 hw/bsp/ublox_bmd_345/syscfg.yml              | 12 +++++++++---
 hw/bsp/ublox_mini_nora_b1/net/syscfg.yml     | 12 +++++++++---
 hw/bsp/ublox_mini_nora_b1/syscfg.yml         | 12 +++++++++---
 hw/bsp/usbmkw41z/syscfg.yml                  | 14 +++++++++-----
 hw/bsp/vbluno51/syscfg.yml                   | 12 +++++++++---
 hw/bsp/vbluno52/syscfg.yml                   | 12 +++++++++---
 88 files changed, 789 insertions(+), 267 deletions(-)

diff --git a/hw/bsp/ada_feather_nrf52/syscfg.yml 
b/hw/bsp/ada_feather_nrf52/syscfg.yml
index bcfdc418d..28e729f00 100644
--- a/hw/bsp/ada_feather_nrf52/syscfg.yml
+++ b/hw/bsp/ada_feather_nrf52/syscfg.yml
@@ -46,9 +46,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: 26
     I2C_0_PIN_SDA: 25
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
     BOOT_SERIAL_DETECT_PIN: 20
@@ -66,3 +63,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/ada_feather_stm32f405/syscfg.yml 
b/hw/bsp/ada_feather_stm32f405/syscfg.yml
index 286d7c63f..5c383ddfe 100644
--- a/hw/bsp/ada_feather_stm32f405/syscfg.yml
+++ b/hw/bsp/ada_feather_stm32f405/syscfg.yml
@@ -21,9 +21,6 @@ syscfg.vals:
     STM32_FLASH_NUM_AREAS: 12
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 128K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_HSI: 0
     STM32_CLOCK_HSE: 1
@@ -64,3 +61,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/apollo2_evb/syscfg.yml b/hw/bsp/apollo2_evb/syscfg.yml
index b54b14253..c4e052b2e 100644
--- a/hw/bsp/apollo2_evb/syscfg.yml
+++ b/hw/bsp/apollo2_evb/syscfg.yml
@@ -101,10 +101,14 @@ syscfg.defs:
         value: 1
         range: 1, 16, 128
 
-syscfg.vals:
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
-
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/apollo3_evb/syscfg.yml b/hw/bsp/apollo3_evb/syscfg.yml
index 8028883dd..a12664be7 100644
--- a/hw/bsp/apollo3_evb/syscfg.yml
+++ b/hw/bsp/apollo3_evb/syscfg.yml
@@ -114,9 +114,6 @@ syscfg.vals:
     UART_1_PIN_RTS: 44
     UART_1_PIN_CTS: 45
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
 
 syscfg.vals.BLE_HOST:
     BLE_TRANSPORT_HS: native
@@ -126,3 +123,12 @@ syscfg.vals.BLE_HOST:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/arduino_primo_nrf52/syscfg.yml 
b/hw/bsp/arduino_primo_nrf52/syscfg.yml
index 9fd054c55..96e987306 100644
--- a/hw/bsp/arduino_primo_nrf52/syscfg.yml
+++ b/hw/bsp/arduino_primo_nrf52/syscfg.yml
@@ -55,9 +55,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: 27
     I2C_0_PIN_SDA: 26
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     SPI_0_MASTER: 1
     MCU_LFCLK_SOURCE: LFXO
@@ -71,3 +68,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/arduino_zero/syscfg.yml b/hw/bsp/arduino_zero/syscfg.yml
index f52557e5a..d0aa227f1 100644
--- a/hw/bsp/arduino_zero/syscfg.yml
+++ b/hw/bsp/arduino_zero/syscfg.yml
@@ -40,9 +40,6 @@ syscfg.defs:
         value:  0
 
 syscfg.vals:
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
 
     # Console history happens at interrupts and arduino is not fast
     # enough to do this and to perform simultaneous transmit and
@@ -51,3 +48,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/b-l072z-lrwan1/syscfg.yml b/hw/bsp/b-l072z-lrwan1/syscfg.yml
index 40ad08134..eeb72c066 100644
--- a/hw/bsp/b-l072z-lrwan1/syscfg.yml
+++ b/hw/bsp/b-l072z-lrwan1/syscfg.yml
@@ -21,9 +21,6 @@ syscfg.vals:
     STM32_FLASH_SIZE_KB: 192
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 20K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     SX1276_SPI_IDX: 1
     SX1276_SPI_CS_PIN: 'MCU_GPIO_PORTB(12)'
     LORA_MAC_TIMER_NUM: 0
@@ -68,3 +65,12 @@ syscfg.vals.BOOT_LOADER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/b-l475e-iot01a/syscfg.yml b/hw/bsp/b-l475e-iot01a/syscfg.yml
index b19f9e181..7f8bb066d 100644
--- a/hw/bsp/b-l475e-iot01a/syscfg.yml
+++ b/hw/bsp/b-l475e-iot01a/syscfg.yml
@@ -29,9 +29,6 @@ syscfg.vals:
     STM32_FLASH_SIZE_KB: 1024
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 96K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     BOOTUTIL_MAX_IMG_SECTORS: 256
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_LSI: 1
@@ -78,3 +75,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/bbc_microbit/syscfg.yml b/hw/bsp/bbc_microbit/syscfg.yml
index 8d0ce9abd..df231a5b0 100644
--- a/hw/bsp/bbc_microbit/syscfg.yml
+++ b/hw/bsp/bbc_microbit/syscfg.yml
@@ -109,9 +109,6 @@ syscfg.vals:
     MCU_TARGET: nRF51822
     MCU_COMMON_STARTUP: 1
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_LFCLK_SOURCE: LFSYNTH
 
 syscfg.vals.BLE_CONTROLLER:
@@ -124,3 +121,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/black_vet6/syscfg.yml b/hw/bsp/black_vet6/syscfg.yml
index 38452a534..5d9347303 100644
--- a/hw/bsp/black_vet6/syscfg.yml
+++ b/hw/bsp/black_vet6/syscfg.yml
@@ -35,9 +35,6 @@ syscfg.vals:
     STM32_FLASH_NUM_AREAS: 8
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 128K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     LITTLEFS_FLASH_AREA: FLASH_AREA_LITTLEFS
     LITTLEFS_BLOCK_SIZE: 4096
     LITTLEFS_BLOCK_COUNT: 24
@@ -118,3 +115,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/blackpill401cc/syscfg.yml b/hw/bsp/blackpill401cc/syscfg.yml
index 9433289f2..7e111a1e4 100644
--- a/hw/bsp/blackpill401cc/syscfg.yml
+++ b/hw/bsp/blackpill401cc/syscfg.yml
@@ -28,9 +28,6 @@ syscfg.vals:
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 0x10000
     BOOTUTIL_SINGLE_APPLICATION_SLOT: 1
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE2'
     STM32_CLOCK_HSI: 0
     STM32_CLOCK_HSE: 1
@@ -77,3 +74,12 @@ syscfg.vals.SPIFLASH8M:
 
 syscfg.vals.'SPIFLASH8M && COREDUMP':
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/blackpill411ce/syscfg.yml b/hw/bsp/blackpill411ce/syscfg.yml
index a3afc45a6..052ea3c5d 100644
--- a/hw/bsp/blackpill411ce/syscfg.yml
+++ b/hw/bsp/blackpill411ce/syscfg.yml
@@ -28,9 +28,6 @@ syscfg.vals:
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 0x20000
     BOOTUTIL_SINGLE_APPLICATION_SLOT: 1
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_HSI: 0
     STM32_CLOCK_HSE: 1
@@ -77,3 +74,12 @@ syscfg.vals.SPIFLASH8M:
 
 syscfg.vals.'SPIFLASH8M && COREDUMP':
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/ble400/syscfg.yml b/hw/bsp/ble400/syscfg.yml
index 8b1270438..d3a563320 100644
--- a/hw/bsp/ble400/syscfg.yml
+++ b/hw/bsp/ble400/syscfg.yml
@@ -105,9 +105,6 @@ syscfg.vals:
     MCU_TARGET: nRF51822
     MCU_COMMON_STARTUP: 1
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 0
     MCU_LFCLK_SOURCE: LFXO
 
@@ -118,3 +115,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/bluepill/syscfg.yml b/hw/bsp/bluepill/syscfg.yml
index cedc20fbd..8bae6f556 100644
--- a/hw/bsp/bluepill/syscfg.yml
+++ b/hw/bsp/bluepill/syscfg.yml
@@ -21,9 +21,6 @@ syscfg.vals:
     STM32_FLASH_SIZE_KB: 128
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 20K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_HSI: 1
     STM32_CLOCK_HSE: 1
     STM32_CLOCK_HSE_BYPASS: 0
@@ -62,3 +59,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/bmd200/syscfg.yml b/hw/bsp/bmd200/syscfg.yml
index 432f59dfa..13938e6d1 100644
--- a/hw/bsp/bmd200/syscfg.yml
+++ b/hw/bsp/bmd200/syscfg.yml
@@ -105,9 +105,6 @@ syscfg.vals:
     MCU_TARGET: nRF51822
     MCU_COMMON_STARTUP: 1
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFSYNTH
 
@@ -121,3 +118,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/bmd300eval/syscfg.yml b/hw/bsp/bmd300eval/syscfg.yml
index 24b492c1c..39c756369 100644
--- a/hw/bsp/bmd300eval/syscfg.yml
+++ b/hw/bsp/bmd300eval/syscfg.yml
@@ -40,9 +40,6 @@ syscfg.vals:
     UART_0_PIN_RTS: 5
     UART_0_PIN_CTS: 7
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
 
@@ -55,3 +52,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/calliope_mini/syscfg.yml b/hw/bsp/calliope_mini/syscfg.yml
index 1a80739f6..b26232ef7 100644
--- a/hw/bsp/calliope_mini/syscfg.yml
+++ b/hw/bsp/calliope_mini/syscfg.yml
@@ -93,9 +93,6 @@ syscfg.vals:
     MCU_TARGET: nRF51822
     MCU_COMMON_STARTUP: 1
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_FCB_CONF
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_FCB_LOG
     MCU_LFCLK_SOURCE: LFSYNTH
 
 
@@ -109,3 +106,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_FCB_LOG
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_FCB_CONF
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/dialog_da14695-dk-usb/syscfg.yml 
b/hw/bsp/dialog_da14695-dk-usb/syscfg.yml
index deda8f291..c182238ec 100644
--- a/hw/bsp/dialog_da14695-dk-usb/syscfg.yml
+++ b/hw/bsp/dialog_da14695-dk-usb/syscfg.yml
@@ -71,9 +71,6 @@ syscfg.vals:
     SPI_0_MASTER_PIN_MOSI: 24
     SPI_0_MASTER_PIN_MISO: 26
     # Configure flash areas
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MYNEWT_DOWNLOADER: bsp_downloader
     MYNEWT_DOWNLOADER_SCRIPT: 
hw/mcu/dialog/da1469x/scripts/dialog_da1469x-download_jlink.sh
 
@@ -83,3 +80,12 @@ syscfg.vals.BLE_TRANSPORT:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/dialog_da1469x-dk-pro/syscfg.yml 
b/hw/bsp/dialog_da1469x-dk-pro/syscfg.yml
index a202c43a5..3bf092f4d 100644
--- a/hw/bsp/dialog_da1469x-dk-pro/syscfg.yml
+++ b/hw/bsp/dialog_da1469x-dk-pro/syscfg.yml
@@ -81,9 +81,6 @@ syscfg.vals:
     SPI_0_MASTER_PIN_MOSI: 24
     SPI_0_MASTER_PIN_MISO: 26
     # Configure flash areas
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MYNEWT_DOWNLOADER: bsp_downloader
     MYNEWT_DOWNLOADER_SCRIPT: 
hw/mcu/dialog/da1469x/scripts/dialog_da1469x-download_jlink.sh
 
@@ -93,3 +90,12 @@ syscfg.vals.BLE_TRANSPORT:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/dwm1001-dev/syscfg.yml b/hw/bsp/dwm1001-dev/syscfg.yml
index d1536d4ac..139ef6fb0 100644
--- a/hw/bsp/dwm1001-dev/syscfg.yml
+++ b/hw/bsp/dwm1001-dev/syscfg.yml
@@ -53,9 +53,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: 28
     I2C_0_PIN_SDA: 29
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
     BOOT_SERIAL_DETECT_PIN: 2  # Button BT_WAKE_UP
@@ -69,3 +66,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/fanstel-ev-bt840/syscfg.yml 
b/hw/bsp/fanstel-ev-bt840/syscfg.yml
index b00c8d747..707fc9e00 100644
--- a/hw/bsp/fanstel-ev-bt840/syscfg.yml
+++ b/hw/bsp/fanstel-ev-bt840/syscfg.yml
@@ -29,9 +29,6 @@ syscfg.vals:
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 0x40000
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
     UART_0_PIN_TX: 34
@@ -51,3 +48,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/fanstel_ev_bt40e/net/syscfg.yml 
b/hw/bsp/fanstel_ev_bt40e/net/syscfg.yml
index ec76a7dd4..e60a15581 100644
--- a/hw/bsp/fanstel_ev_bt40e/net/syscfg.yml
+++ b/hw/bsp/fanstel_ev_bt40e/net/syscfg.yml
@@ -66,9 +66,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: ARDUINO_PIN_A5
     I2C_0_PIN_SDA: ARDUINO_PIN_A4
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     #Net Core DCDC is enabled from application core
     #MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
@@ -113,3 +110,12 @@ syscfg.vals.'FANSTEL_NRF5340_MODULE=="BT40NE" || 
FANSTEL_NRF5340_MODULE=="BT40N"
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_COREDUMP
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/fanstel_ev_bt40e/syscfg.yml 
b/hw/bsp/fanstel_ev_bt40e/syscfg.yml
index 386646ac4..3661bef76 100644
--- a/hw/bsp/fanstel_ev_bt40e/syscfg.yml
+++ b/hw/bsp/fanstel_ev_bt40e/syscfg.yml
@@ -75,9 +75,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: ARDUINO_PIN_A5
     I2C_0_PIN_SDA: ARDUINO_PIN_A4
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
 
     # Always use non-blocking API
@@ -145,3 +142,12 @@ syscfg.restrictions:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/frdm-k64f/syscfg.yml b/hw/bsp/frdm-k64f/syscfg.yml
index 9fe0fddb0..50a33c5e2 100644
--- a/hw/bsp/frdm-k64f/syscfg.yml
+++ b/hw/bsp/frdm-k64f/syscfg.yml
@@ -65,12 +65,18 @@ syscfg.vals:
     UART_5_PIN_TX: 9
     UART_5_PIN_RX: 8
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
 
     # BSP uses private version of _sbrk
     HAL_SBRK: 0
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/frdm-k82f/syscfg.yml b/hw/bsp/frdm-k82f/syscfg.yml
index ef7572765..331d956c6 100644
--- a/hw/bsp/frdm-k82f/syscfg.yml
+++ b/hw/bsp/frdm-k82f/syscfg.yml
@@ -79,9 +79,6 @@ syscfg.vals:
     QSPI_FLASH_SECTOR_COUNT: 1024
     QSPI_FLASH_MIN_WRITE_SIZE: 8
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_FCB
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     LITTLEFS_FLASH_AREA: FLASH_AREA_NFFS
     LITTLEFS_BLOCK_SIZE: 4096
     LITTLEFS_BLOCK_COUNT: 128
@@ -97,3 +94,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_FCB
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/hifive1/syscfg.yml b/hw/bsp/hifive1/syscfg.yml
index 763b76a68..6bb71b843 100644
--- a/hw/bsp/hifive1/syscfg.yml
+++ b/hw/bsp/hifive1/syscfg.yml
@@ -23,8 +23,6 @@ syscfg.vals:
     TIMER_0: 1
     TIMER_1: 1
     TIMER_2: 1
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
 
 syscfg.defs.BUS_DRIVER_PRESENT:
     BSP_FLASH_SPI_NAME:
@@ -33,3 +31,9 @@ syscfg.defs.BUS_DRIVER_PRESENT:
     BSP_FLASH_SPI_BUS:
         description: 'bus name SPIFLASH is connected to'
         value:
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/lpcxpresso55s28/syscfg.yml 
b/hw/bsp/lpcxpresso55s28/syscfg.yml
index 8d87f142b..56fc8ca9d 100644
--- a/hw/bsp/lpcxpresso55s28/syscfg.yml
+++ b/hw/bsp/lpcxpresso55s28/syscfg.yml
@@ -66,9 +66,15 @@ syscfg.vals:
     UART_5_PIN_RX: 8
 
     BOOTUTIL_MAX_IMG_SECTORS: 6
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/native-armv7/syscfg.yml b/hw/bsp/native-armv7/syscfg.yml
index 7d5289dc9..a08aeb170 100644
--- a/hw/bsp/native-armv7/syscfg.yml
+++ b/hw/bsp/native-armv7/syscfg.yml
@@ -29,12 +29,18 @@ syscfg.vals:
     SYSINIT_PANIC_FILE_LINE: 1
     SYSINIT_PANIC_MESSAGE: 1
 
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
 
 syscfg.vals.BLE_CONTROLLER:
     OS_CPUTIME_FREQ: 32768
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/native/syscfg.yml b/hw/bsp/native/syscfg.yml
index c0e8fe837..9a94f5423 100644
--- a/hw/bsp/native/syscfg.yml
+++ b/hw/bsp/native/syscfg.yml
@@ -30,12 +30,18 @@ syscfg.vals:
     SYSINIT_PANIC_FILE_LINE: 1
     SYSINIT_PANIC_MESSAGE: 1
 
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
 
 syscfg.vals.BLE_CONTROLLER:
     OS_CPUTIME_FREQ: 32768
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nina-b1/syscfg.yml b/hw/bsp/nina-b1/syscfg.yml
index f9480bb5e..95dd6c6f8 100644
--- a/hw/bsp/nina-b1/syscfg.yml
+++ b/hw/bsp/nina-b1/syscfg.yml
@@ -52,9 +52,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: 3
     I2C_0_PIN_SDA: 2
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
     BOOT_SERIAL_DETECT_PIN: 16  # on IRC-BTLE board P0.16=SWITCH_1
@@ -69,3 +66,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nordic_pca10028-16k/syscfg.yml 
b/hw/bsp/nordic_pca10028-16k/syscfg.yml
index dee310098..1d28b2f86 100644
--- a/hw/bsp/nordic_pca10028-16k/syscfg.yml
+++ b/hw/bsp/nordic_pca10028-16k/syscfg.yml
@@ -105,9 +105,6 @@ syscfg.vals:
     MCU_TARGET: nRF51822_16K
     MCU_COMMON_STARTUP: 1
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
 
@@ -124,3 +121,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nordic_pca10028/syscfg.yml 
b/hw/bsp/nordic_pca10028/syscfg.yml
index 6def1ee91..1b830b105 100644
--- a/hw/bsp/nordic_pca10028/syscfg.yml
+++ b/hw/bsp/nordic_pca10028/syscfg.yml
@@ -105,9 +105,6 @@ syscfg.vals:
     MCU_TARGET: nRF51822
     MCU_COMMON_STARTUP: 1
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
 
@@ -124,3 +121,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nordic_pca10040/syscfg.yml 
b/hw/bsp/nordic_pca10040/syscfg.yml
index fa51b501c..c1e5e97c7 100644
--- a/hw/bsp/nordic_pca10040/syscfg.yml
+++ b/hw/bsp/nordic_pca10040/syscfg.yml
@@ -56,9 +56,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: 27
     I2C_0_PIN_SDA: 26
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
     BOOT_SERIAL_DETECT_PIN: 13  # Button 1
@@ -78,3 +75,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nordic_pca10056/syscfg.yml 
b/hw/bsp/nordic_pca10056/syscfg.yml
index 83bd1a705..4471365fa 100644
--- a/hw/bsp/nordic_pca10056/syscfg.yml
+++ b/hw/bsp/nordic_pca10056/syscfg.yml
@@ -49,9 +49,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: 27
     I2C_0_PIN_SDA: 26
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
     QSPI_FLASH_SECTOR_SIZE: 4096
@@ -79,3 +76,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nordic_pca10059/syscfg.yml 
b/hw/bsp/nordic_pca10059/syscfg.yml
index 4cffa3a94..2a11a4673 100644
--- a/hw/bsp/nordic_pca10059/syscfg.yml
+++ b/hw/bsp/nordic_pca10059/syscfg.yml
@@ -50,9 +50,6 @@ syscfg.vals:
 
     UART_0: 0
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
 
@@ -65,3 +62,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nordic_pca10090/syscfg.yml 
b/hw/bsp/nordic_pca10090/syscfg.yml
index cf238166b..ef8a19034 100644
--- a/hw/bsp/nordic_pca10090/syscfg.yml
+++ b/hw/bsp/nordic_pca10090/syscfg.yml
@@ -63,9 +63,6 @@ syscfg.vals:
     SPI_0_SLAVE_PIN_MISO: 17
     SPI_0_SLAVE_PIN_SS: 16
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
     BOOT_SERIAL_DETECT_PIN: 6  # Button 1
@@ -73,3 +70,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nordic_pca10095/syscfg.yml 
b/hw/bsp/nordic_pca10095/syscfg.yml
index b078309a1..5ccacdbcf 100644
--- a/hw/bsp/nordic_pca10095/syscfg.yml
+++ b/hw/bsp/nordic_pca10095/syscfg.yml
@@ -61,9 +61,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: ARDUINO_PIN_A5
     I2C_0_PIN_SDA: ARDUINO_PIN_A4
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
 
     # Always use non-blocking API
@@ -125,3 +122,12 @@ syscfg.restrictions:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nordic_pca10095_net/syscfg.yml 
b/hw/bsp/nordic_pca10095_net/syscfg.yml
index 862b3de75..d1eb27a2c 100644
--- a/hw/bsp/nordic_pca10095_net/syscfg.yml
+++ b/hw/bsp/nordic_pca10095_net/syscfg.yml
@@ -55,9 +55,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: ARDUINO_PIN_A5
     I2C_0_PIN_SDA: ARDUINO_PIN_A4
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     #Net Core DCDC is enabled from application core
     #MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
@@ -85,3 +82,12 @@ syscfg.vals.BLE_TRANSPORT:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_COREDUMP
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nordic_pca10121/net/syscfg.yml 
b/hw/bsp/nordic_pca10121/net/syscfg.yml
index e416017a9..7ea493c9d 100644
--- a/hw/bsp/nordic_pca10121/net/syscfg.yml
+++ b/hw/bsp/nordic_pca10121/net/syscfg.yml
@@ -53,9 +53,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: ARDUINO_PIN_A5
     I2C_0_PIN_SDA: ARDUINO_PIN_A4
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     #Net Core DCDC is enabled from application core
     #MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
@@ -86,3 +83,12 @@ syscfg.vals.BLE_TRANSPORT:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_COREDUMP
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nordic_pca10121/syscfg.yml 
b/hw/bsp/nordic_pca10121/syscfg.yml
index 81ac2879d..e90462b62 100644
--- a/hw/bsp/nordic_pca10121/syscfg.yml
+++ b/hw/bsp/nordic_pca10121/syscfg.yml
@@ -66,9 +66,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: ARDUINO_PIN_A5
     I2C_0_PIN_SDA: ARDUINO_PIN_A4
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
 
     # Always use non-blocking API
@@ -126,3 +123,12 @@ syscfg.restrictions:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nordic_pca20020/syscfg.yml 
b/hw/bsp/nordic_pca20020/syscfg.yml
index 2801aeff0..27a48fb50 100644
--- a/hw/bsp/nordic_pca20020/syscfg.yml
+++ b/hw/bsp/nordic_pca20020/syscfg.yml
@@ -56,9 +56,6 @@ syscfg.vals:
     I2C_1_PIN_SCL: 7
     I2C_1_PIN_SDA: 8
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
     BOOT_SERIAL_DETECT_PIN: 11  # Button 1
@@ -75,3 +72,12 @@ syscfg.restrictions:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nordic_thingy53/syscfg.yml 
b/hw/bsp/nordic_thingy53/syscfg.yml
index 990f003be..9fb5326fc 100644
--- a/hw/bsp/nordic_thingy53/syscfg.yml
+++ b/hw/bsp/nordic_thingy53/syscfg.yml
@@ -49,9 +49,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: 35
     I2C_0_PIN_SDA: 34
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
 
     # Always use non-blocking API
@@ -115,3 +112,12 @@ syscfg.restrictions:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nrf51-arduino_101/syscfg.yml 
b/hw/bsp/nrf51-arduino_101/syscfg.yml
index 78cd52e92..e4920e6a9 100644
--- a/hw/bsp/nrf51-arduino_101/syscfg.yml
+++ b/hw/bsp/nrf51-arduino_101/syscfg.yml
@@ -105,9 +105,6 @@ syscfg.vals:
     MCU_TARGET: nRF51822
     MCU_COMMON_STARTUP: 1
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     SPI_0_MASTER: 1
     SPI_1_SLAVE: 1
     MCU_LFCLK_SOURCE: LFXO
@@ -119,3 +116,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nrf51-blenano/syscfg.yml b/hw/bsp/nrf51-blenano/syscfg.yml
index b0617f463..6d59a01fd 100644
--- a/hw/bsp/nrf51-blenano/syscfg.yml
+++ b/hw/bsp/nrf51-blenano/syscfg.yml
@@ -82,9 +82,6 @@ syscfg.vals:
     MCU_TARGET: nRF51822
     MCU_COMMON_STARTUP: 1
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
 
@@ -95,3 +92,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-f030r8/syscfg.yml b/hw/bsp/nucleo-f030r8/syscfg.yml
index 0d8c48172..81a19c0cd 100644
--- a/hw/bsp/nucleo-f030r8/syscfg.yml
+++ b/hw/bsp/nucleo-f030r8/syscfg.yml
@@ -22,9 +22,6 @@ syscfg.vals:
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 0x2000
     INCLUDE_IMAGE_HEADER: 0
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     OS_MAIN_STACK_SIZE: 128
     MSYS_1_BLOCK_COUNT: 0
     STM32_CLOCK_HSI: 1
@@ -47,3 +44,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-f072rb/syscfg.yml b/hw/bsp/nucleo-f072rb/syscfg.yml
index 449656f36..c346077f4 100644
--- a/hw/bsp/nucleo-f072rb/syscfg.yml
+++ b/hw/bsp/nucleo-f072rb/syscfg.yml
@@ -22,9 +22,6 @@ syscfg.vals:
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 0x4000
     INCLUDE_IMAGE_HEADER: 0
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MSYS_1_BLOCK_COUNT: 0
     STM32_CLOCK_HSI: 0
     STM32_CLOCK_HSI48: 0
@@ -54,3 +51,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-f103rb/syscfg.yml b/hw/bsp/nucleo-f103rb/syscfg.yml
index 1101b57b4..2be10b548 100644
--- a/hw/bsp/nucleo-f103rb/syscfg.yml
+++ b/hw/bsp/nucleo-f103rb/syscfg.yml
@@ -21,9 +21,6 @@ syscfg.vals:
     STM32_FLASH_SIZE_KB: 128
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 20K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_HSI: 1
     STM32_CLOCK_HSE: 1
     STM32_CLOCK_HSE_BYPASS: 1
@@ -65,3 +62,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-f303k8/syscfg.yml b/hw/bsp/nucleo-f303k8/syscfg.yml
index 1eb6edf27..e2e236d22 100644
--- a/hw/bsp/nucleo-f303k8/syscfg.yml
+++ b/hw/bsp/nucleo-f303k8/syscfg.yml
@@ -21,9 +21,6 @@ syscfg.vals:
     STM32_FLASH_SIZE_KB: 64
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 12K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_HSI: 1
     STM32_CLOCK_HSE: 0
     STM32_CLOCK_HSE_BYPASS: 0
@@ -53,3 +50,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-f303re/syscfg.yml b/hw/bsp/nucleo-f303re/syscfg.yml
index 5a1a10243..657b8149b 100644
--- a/hw/bsp/nucleo-f303re/syscfg.yml
+++ b/hw/bsp/nucleo-f303re/syscfg.yml
@@ -21,10 +21,7 @@ syscfg.vals:
     STM32_FLASH_SIZE_KB: 512
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 64K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
     CONFIG_FCB_NUM_AREAS: 23
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_HSI: 1
     STM32_CLOCK_HSE: 0
     STM32_CLOCK_HSE_BYPASS: 0
@@ -54,3 +51,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-f401re/syscfg.yml b/hw/bsp/nucleo-f401re/syscfg.yml
index b7901e018..e18b128f3 100644
--- a/hw/bsp/nucleo-f401re/syscfg.yml
+++ b/hw/bsp/nucleo-f401re/syscfg.yml
@@ -22,9 +22,6 @@ syscfg.vals:
     STM32_FLASH_NUM_AREAS: 8
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 96K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE2'
     STM32_CLOCK_HSI: 0
     STM32_CLOCK_HSE: 1
@@ -58,3 +55,12 @@ syscfg.vals.BOOT_LOADER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-f411re/syscfg.yml b/hw/bsp/nucleo-f411re/syscfg.yml
index 54f8b0551..05c8c02a4 100644
--- a/hw/bsp/nucleo-f411re/syscfg.yml
+++ b/hw/bsp/nucleo-f411re/syscfg.yml
@@ -22,9 +22,6 @@ syscfg.vals:
     STM32_FLASH_NUM_AREAS: 8
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 128K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_HSI: 0
     STM32_CLOCK_HSE: 1
@@ -69,3 +66,12 @@ syscfg.vals.BOOT_LOADER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-f413zh/syscfg.yml b/hw/bsp/nucleo-f413zh/syscfg.yml
index 30149fd4c..70de06f57 100644
--- a/hw/bsp/nucleo-f413zh/syscfg.yml
+++ b/hw/bsp/nucleo-f413zh/syscfg.yml
@@ -22,9 +22,6 @@ syscfg.vals:
     STM32_FLASH_NUM_AREAS: 16
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 256K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_HSI: 0
     STM32_CLOCK_HSE: 1
@@ -57,3 +54,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-f439zi/syscfg.yml b/hw/bsp/nucleo-f439zi/syscfg.yml
index c461e12cb..2d251c2ec 100644
--- a/hw/bsp/nucleo-f439zi/syscfg.yml
+++ b/hw/bsp/nucleo-f439zi/syscfg.yml
@@ -22,9 +22,6 @@ syscfg.vals:
     STM32_FLASH_NUM_AREAS: 24
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 192K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_HSI: 0
     STM32_CLOCK_HSE: 1
@@ -56,3 +53,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-f746zg/syscfg.yml b/hw/bsp/nucleo-f746zg/syscfg.yml
index 1ce5ca6c6..a0f30fb7a 100644
--- a/hw/bsp/nucleo-f746zg/syscfg.yml
+++ b/hw/bsp/nucleo-f746zg/syscfg.yml
@@ -22,9 +22,6 @@ syscfg.vals:
     STM32_FLASH_NUM_AREAS: 8
     MCU_RAM_START: 0x20010000
     MCU_RAM_SIZE: 240K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE2'
     STM32_CLOCK_HSI: 0
     STM32_CLOCK_HSE: 1
@@ -71,3 +68,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-f767zi/syscfg.yml b/hw/bsp/nucleo-f767zi/syscfg.yml
index adfd80289..b0cc9f9b3 100644
--- a/hw/bsp/nucleo-f767zi/syscfg.yml
+++ b/hw/bsp/nucleo-f767zi/syscfg.yml
@@ -22,9 +22,6 @@ syscfg.vals:
     STM32_FLASH_NUM_AREAS: 12
     MCU_RAM_START: 0x20020000
     MCU_RAM_SIZE: 368K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE2'
     STM32_CLOCK_HSI: 0
     STM32_CLOCK_HSE: 1
@@ -80,3 +77,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-g0b1re/syscfg.yml b/hw/bsp/nucleo-g0b1re/syscfg.yml
index e19836af8..65ed5cac4 100644
--- a/hw/bsp/nucleo-g0b1re/syscfg.yml
+++ b/hw/bsp/nucleo-g0b1re/syscfg.yml
@@ -19,9 +19,6 @@
 
 syscfg.vals:
     STM32_FLASH_SIZE_KB: 512
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_HSI: 1
     STM32_CLOCK_HSE: 0
@@ -67,3 +64,12 @@ syscfg.vals.CONFIG_FCB:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-g491re/syscfg.yml b/hw/bsp/nucleo-g491re/syscfg.yml
index cd5b84f98..7e470edb3 100644
--- a/hw/bsp/nucleo-g491re/syscfg.yml
+++ b/hw/bsp/nucleo-g491re/syscfg.yml
@@ -19,9 +19,6 @@
 
 syscfg.vals:
     STM32_FLASH_SIZE_KB: 512
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_HSI: 1
     STM32_CLOCK_HSE: 0
@@ -69,3 +66,12 @@ syscfg.vals.CONFIG_FCB:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-h563zi/syscfg.yml b/hw/bsp/nucleo-h563zi/syscfg.yml
index 76edb8d0d..01d96653d 100644
--- a/hw/bsp/nucleo-h563zi/syscfg.yml
+++ b/hw/bsp/nucleo-h563zi/syscfg.yml
@@ -63,9 +63,6 @@ syscfg.vals:
     TIMER_2_TIM: 'TIM14'
 
     # Configure flash areas
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
 
     # Flasher parameters
     MYNEWT_DOWNLOADER: stm32_programmer_cli
@@ -74,3 +71,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-h723zg/syscfg.yml b/hw/bsp/nucleo-h723zg/syscfg.yml
index 113611cbc..b92edb62f 100644
--- a/hw/bsp/nucleo-h723zg/syscfg.yml
+++ b/hw/bsp/nucleo-h723zg/syscfg.yml
@@ -22,9 +22,6 @@ syscfg.vals:
     STM32_FLASH_NUM_AREAS: 8
     MCU_RAM_START: 0x24000000
     MCU_RAM_SIZE: 0x50000
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE0'
     STM32_CLOCK_HSI: 1
     STM32_CLOCK_HSE: 0
@@ -72,3 +69,12 @@ syscfg.vals.TRNG:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-h753zi/syscfg.yml b/hw/bsp/nucleo-h753zi/syscfg.yml
index b47be24b3..b16d21bbc 100644
--- a/hw/bsp/nucleo-h753zi/syscfg.yml
+++ b/hw/bsp/nucleo-h753zi/syscfg.yml
@@ -22,9 +22,6 @@ syscfg.vals:
     STM32_FLASH_NUM_AREAS: 16
     MCU_RAM_START: 0x24000000
     MCU_RAM_SIZE: 0x80000
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE0'
     STM32_CLOCK_HSI: 1
     STM32_CLOCK_HSE: 1
@@ -71,3 +68,12 @@ syscfg.vals.TRNG:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-l073rz/syscfg.yml b/hw/bsp/nucleo-l073rz/syscfg.yml
index 28d8636cf..939340e7e 100644
--- a/hw/bsp/nucleo-l073rz/syscfg.yml
+++ b/hw/bsp/nucleo-l073rz/syscfg.yml
@@ -21,9 +21,6 @@ syscfg.vals:
     STM32_FLASH_SIZE_KB: 192
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 20K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_LSI: 1
     STM32_CLOCK_LSE: 0
@@ -73,3 +70,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-l476rg/syscfg.yml b/hw/bsp/nucleo-l476rg/syscfg.yml
index 816976835..12f551a01 100644
--- a/hw/bsp/nucleo-l476rg/syscfg.yml
+++ b/hw/bsp/nucleo-l476rg/syscfg.yml
@@ -25,9 +25,6 @@ syscfg.vals:
     STM32_FLASH_SIZE_KB: 1024
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 96K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     BOOTUTIL_MAX_IMG_SECTORS: 256
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_LSI: 1
@@ -82,3 +79,12 @@ syscfg.vals.BOOT_LOADER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/nucleo-u575zi-q/syscfg.yml 
b/hw/bsp/nucleo-u575zi-q/syscfg.yml
index cebbb57ee..3d3e36616 100644
--- a/hw/bsp/nucleo-u575zi-q/syscfg.yml
+++ b/hw/bsp/nucleo-u575zi-q/syscfg.yml
@@ -19,9 +19,6 @@
 
 syscfg.vals:
     STM32_FLASH_SIZE_KB: 2048
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_HSI: 1
     STM32_CLOCK_HSE: 0
@@ -70,3 +67,12 @@ syscfg.vals.TRNG:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/olimex-p103/syscfg.yml b/hw/bsp/olimex-p103/syscfg.yml
index 902dc5a0d..d3e124e15 100644
--- a/hw/bsp/olimex-p103/syscfg.yml
+++ b/hw/bsp/olimex-p103/syscfg.yml
@@ -24,9 +24,6 @@ syscfg.vals:
     BOOTUTIL_SINGLE_APPLICATION_SLOT: 1
     INCLUDE_IMAGE_HEADER: 0
 
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_HSI: 1
     STM32_CLOCK_HSE: 1
     STM32_CLOCK_HSE_BYPASS: 0
@@ -58,3 +55,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/olimex-pic32-emz64/syscfg.yml 
b/hw/bsp/olimex-pic32-emz64/syscfg.yml
index e3348685e..1f6572d24 100644
--- a/hw/bsp/olimex-pic32-emz64/syscfg.yml
+++ b/hw/bsp/olimex-pic32-emz64/syscfg.yml
@@ -28,9 +28,6 @@ syscfg.defs:
         range: 8000000, 24000000, 50000000, 100000000, 200000000
 
 syscfg.vals:
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     TIMER_0: 1
     I2C_3: 1
     I2C_3_FREQ_KHZ: 400
@@ -57,3 +54,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/olimex-pic32-hmz144/syscfg.yml 
b/hw/bsp/olimex-pic32-hmz144/syscfg.yml
index 7e1bcdf9e..9af0b0651 100644
--- a/hw/bsp/olimex-pic32-hmz144/syscfg.yml
+++ b/hw/bsp/olimex-pic32-hmz144/syscfg.yml
@@ -28,9 +28,6 @@ syscfg.defs:
         range: 8000000, 24000000, 50000000, 100000000, 200000000
 
 syscfg.vals:
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     TIMER_0: 1
 
     # UART_1 available on UEXT header
@@ -59,3 +56,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/olimex_stm32-e407_devboard/syscfg.yml 
b/hw/bsp/olimex_stm32-e407_devboard/syscfg.yml
index 81c4cf45c..85e4bf02b 100644
--- a/hw/bsp/olimex_stm32-e407_devboard/syscfg.yml
+++ b/hw/bsp/olimex_stm32-e407_devboard/syscfg.yml
@@ -21,9 +21,6 @@ syscfg.vals:
     STM32_FLASH_NUM_AREAS: 12
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 128K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_HSI: 0
     STM32_CLOCK_HSE: 1
@@ -54,3 +51,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/p-nucleo-wb55-usbdongle/syscfg.yml 
b/hw/bsp/p-nucleo-wb55-usbdongle/syscfg.yml
index 8a95aff37..924b0d6bf 100644
--- a/hw/bsp/p-nucleo-wb55-usbdongle/syscfg.yml
+++ b/hw/bsp/p-nucleo-wb55-usbdongle/syscfg.yml
@@ -36,9 +36,6 @@ syscfg.vals:
     STM32_FLASH_SIZE_KB: 1024
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 192K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_LSI1: 1
     STM32_CLOCK_LSI2: 0
@@ -88,3 +85,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/p-nucleo-wb55/syscfg.yml b/hw/bsp/p-nucleo-wb55/syscfg.yml
index 6eedb95ed..752f458fd 100644
--- a/hw/bsp/p-nucleo-wb55/syscfg.yml
+++ b/hw/bsp/p-nucleo-wb55/syscfg.yml
@@ -21,9 +21,6 @@ syscfg.vals:
     STM32_FLASH_SIZE_KB: 1024
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 192K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_LSI1: 1
     STM32_CLOCK_LSI2: 0
@@ -73,3 +70,12 @@ syscfg.vals:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/pinetime/syscfg.yml b/hw/bsp/pinetime/syscfg.yml
index 03dc55534..7ffeb0a37 100644
--- a/hw/bsp/pinetime/syscfg.yml
+++ b/hw/bsp/pinetime/syscfg.yml
@@ -82,9 +82,6 @@ syscfg.vals:
     NFC_PINS_AS_GPIO: 1
 
     # Define flash areas
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
 
     # SPI Flash
     SPIFLASH:               1
@@ -128,3 +125,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/puckjs/syscfg.yml b/hw/bsp/puckjs/syscfg.yml
index d0511e692..9b6531e92 100644
--- a/hw/bsp/puckjs/syscfg.yml
+++ b/hw/bsp/puckjs/syscfg.yml
@@ -43,9 +43,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: 19
     I2C_0_PIN_SDA: 20
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFSYNTH
 
@@ -62,3 +59,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/rb-blend2/syscfg.yml b/hw/bsp/rb-blend2/syscfg.yml
index 51a155c7e..1947030b7 100644
--- a/hw/bsp/rb-blend2/syscfg.yml
+++ b/hw/bsp/rb-blend2/syscfg.yml
@@ -53,9 +53,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: 27
     I2C_0_PIN_SDA: 26
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
 
@@ -68,3 +65,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/rb-nano2/syscfg.yml b/hw/bsp/rb-nano2/syscfg.yml
index de96321c3..7461da515 100644
--- a/hw/bsp/rb-nano2/syscfg.yml
+++ b/hw/bsp/rb-nano2/syscfg.yml
@@ -60,9 +60,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: 2
     I2C_0_PIN_SDA: 28
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
 
@@ -75,3 +72,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/reel_board/syscfg.yml b/hw/bsp/reel_board/syscfg.yml
index 045a52a10..235fd7bfb 100644
--- a/hw/bsp/reel_board/syscfg.yml
+++ b/hw/bsp/reel_board/syscfg.yml
@@ -32,9 +32,6 @@ syscfg.vals:
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 0x40000
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
     UART_0_PIN_TX: 6
@@ -65,3 +62,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/ruuvitag_rev_b/syscfg.yml b/hw/bsp/ruuvitag_rev_b/syscfg.yml
index e595c92d7..274898c77 100644
--- a/hw/bsp/ruuvitag_rev_b/syscfg.yml
+++ b/hw/bsp/ruuvitag_rev_b/syscfg.yml
@@ -72,9 +72,6 @@ syscfg.vals:
     SPI_0_MASTER_PIN_MOSI: 25
     SPI_0_MASTER_PIN_MISO: 28
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
     BOOT_SERIAL_DETECT_PIN: 13  # Button 1
@@ -98,3 +95,12 @@ syscfg.restrictions:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/stm32f3discovery/syscfg.yml 
b/hw/bsp/stm32f3discovery/syscfg.yml
index 891a3852c..e113e49a3 100644
--- a/hw/bsp/stm32f3discovery/syscfg.yml
+++ b/hw/bsp/stm32f3discovery/syscfg.yml
@@ -31,10 +31,7 @@ syscfg.vals:
     STM32_FLASH_SIZE_KB: 256
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 48K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
     CONFIG_FCB_NUM_AREAS: 16
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     BOOT_SERIAL_DETECT_PIN: 0  # USER button
     BOOT_SERIAL_DETECT_PIN_CFG: 'HAL_GPIO_PULL_NONE'
     BOOT_SERIAL_DETECT_PIN_VAL: 1
@@ -79,3 +76,12 @@ syscfg.restrictions:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/stm32f411discovery/syscfg.yml 
b/hw/bsp/stm32f411discovery/syscfg.yml
index b580b364b..43d4cc35f 100644
--- a/hw/bsp/stm32f411discovery/syscfg.yml
+++ b/hw/bsp/stm32f411discovery/syscfg.yml
@@ -22,9 +22,6 @@ syscfg.vals:
     STM32_FLASH_NUM_AREAS: 8
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 128K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_HSI: 0
     STM32_CLOCK_HSE: 1
@@ -65,3 +62,12 @@ syscfg.vals.BOOT_LOADER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/stm32f429discovery/syscfg.yml 
b/hw/bsp/stm32f429discovery/syscfg.yml
index faae9b68d..cdce90744 100644
--- a/hw/bsp/stm32f429discovery/syscfg.yml
+++ b/hw/bsp/stm32f429discovery/syscfg.yml
@@ -22,9 +22,6 @@ syscfg.vals:
     STM32_FLASH_NUM_AREAS: 24
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 256K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_HSI: 0
     STM32_CLOCK_HSE: 1
@@ -60,3 +57,12 @@ syscfg.vals.BOOT_LOADER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/stm32f4discovery/syscfg.yml 
b/hw/bsp/stm32f4discovery/syscfg.yml
index e54942c95..82dcc8121 100644
--- a/hw/bsp/stm32f4discovery/syscfg.yml
+++ b/hw/bsp/stm32f4discovery/syscfg.yml
@@ -22,9 +22,6 @@ syscfg.vals:
     STM32_FLASH_NUM_AREAS: 12
     MCU_RAM_START: 0x20000000
     MCU_RAM_SIZE: 128K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_HSI: 0
     STM32_CLOCK_HSE: 1
@@ -63,3 +60,12 @@ syscfg.vals.BOOT_LOADER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/stm32f7discovery/syscfg.yml 
b/hw/bsp/stm32f7discovery/syscfg.yml
index 124953ace..ad06ade9d 100644
--- a/hw/bsp/stm32f7discovery/syscfg.yml
+++ b/hw/bsp/stm32f7discovery/syscfg.yml
@@ -22,9 +22,6 @@ syscfg.vals:
     STM32_FLASH_NUM_AREAS: 8
     MCU_RAM_START: 0x20010000
     MCU_RAM_SIZE: 240K
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_FCB
-    NFFS_FLASH_AREA: FLASH_AREA_LITTLEFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE2'
     STM32_CLOCK_HSI: 0
     STM32_CLOCK_HSE: 1
@@ -67,3 +64,12 @@ syscfg.vals.STM32_QSPI_FLASH:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_LITTLEFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_FCB
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/stm32l152discovery/syscfg.yml 
b/hw/bsp/stm32l152discovery/syscfg.yml
index 2ac0c40fa..1e995d26d 100644
--- a/hw/bsp/stm32l152discovery/syscfg.yml
+++ b/hw/bsp/stm32l152discovery/syscfg.yml
@@ -19,9 +19,6 @@
 
 syscfg.vals:
     STM32_FLASH_SIZE_KB: 256
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     STM32_CLOCK_VOLTAGESCALING_CONFIG: 'PWR_REGULATOR_VOLTAGE_SCALE1'
     STM32_CLOCK_LSI: 1
     STM32_CLOCK_LSE: 0
@@ -58,3 +55,12 @@ syscfg.vals.BOOT_LOADER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/telee02/syscfg.yml b/hw/bsp/telee02/syscfg.yml
index 53061883b..41868c891 100644
--- a/hw/bsp/telee02/syscfg.yml
+++ b/hw/bsp/telee02/syscfg.yml
@@ -46,9 +46,6 @@ syscfg.vals:
     SPI_0_MASTER_PIN_MOSI: 23
     SPI_0_MASTER_PIN_MISO: 24
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     SPI_0_MASTER: 1 # for talking to the SX1276
     SX1276_SPI_IDX: 0
@@ -66,3 +63,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/ublox_bmd_345/syscfg.yml b/hw/bsp/ublox_bmd_345/syscfg.yml
index 45ead68cb..40fb640b1 100644
--- a/hw/bsp/ublox_bmd_345/syscfg.yml
+++ b/hw/bsp/ublox_bmd_345/syscfg.yml
@@ -51,9 +51,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: 27
     I2C_0_PIN_SDA: 26
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     # DCDC must be disabled
     MCU_DCDC_ENABLED: 0
     QSPI_FLASH_SECTOR_SIZE: 4096
@@ -92,3 +89,12 @@ syscfg.restrictions:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/ublox_mini_nora_b1/net/syscfg.yml 
b/hw/bsp/ublox_mini_nora_b1/net/syscfg.yml
index ae42a0370..4b56716ad 100644
--- a/hw/bsp/ublox_mini_nora_b1/net/syscfg.yml
+++ b/hw/bsp/ublox_mini_nora_b1/net/syscfg.yml
@@ -58,9 +58,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: 34
     I2C_0_PIN_SDA: 35
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     #Net Core DCDC is enabled from application core
     #MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
@@ -91,3 +88,12 @@ syscfg.vals.BLE_TRANSPORT:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_COREDUMP
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/ublox_mini_nora_b1/syscfg.yml 
b/hw/bsp/ublox_mini_nora_b1/syscfg.yml
index 1b787e19c..99abba6dc 100644
--- a/hw/bsp/ublox_mini_nora_b1/syscfg.yml
+++ b/hw/bsp/ublox_mini_nora_b1/syscfg.yml
@@ -72,9 +72,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: 34
     I2C_0_PIN_SDA: 35
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
 
     # Always use non-blocking API
@@ -138,3 +135,12 @@ syscfg.restrictions:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/usbmkw41z/syscfg.yml b/hw/bsp/usbmkw41z/syscfg.yml
index 625c257f8..5496e1424 100644
--- a/hw/bsp/usbmkw41z/syscfg.yml
+++ b/hw/bsp/usbmkw41z/syscfg.yml
@@ -22,10 +22,14 @@ syscfg.defs:
         description: 'Set to indicate that BSP has MKW41Z'
         value: 1
 
-syscfg.vals:
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
-
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/vbluno51/syscfg.yml b/hw/bsp/vbluno51/syscfg.yml
index 04276542b..8eba6bcdf 100644
--- a/hw/bsp/vbluno51/syscfg.yml
+++ b/hw/bsp/vbluno51/syscfg.yml
@@ -105,9 +105,6 @@ syscfg.vals:
     MCU_TARGET: nRF51822
     MCU_COMMON_STARTUP: 1
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     I2C_0: 1
     I2C_1: 1
     MCU_LFCLK_SOURCE: LFXO
@@ -119,3 +116,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/vbluno52/syscfg.yml b/hw/bsp/vbluno52/syscfg.yml
index bc8b9d68f..9798075a5 100644
--- a/hw/bsp/vbluno52/syscfg.yml
+++ b/hw/bsp/vbluno52/syscfg.yml
@@ -50,9 +50,6 @@ syscfg.vals:
     I2C_0_PIN_SCL: 27
     I2C_0_PIN_SDA: 26
 
-    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
-    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
-    NFFS_FLASH_AREA: FLASH_AREA_NFFS
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
 
@@ -65,3 +62,12 @@ syscfg.vals.BLE_CONTROLLER:
 
 syscfg.vals.COREDUMP:
     COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+
+syscfg.vals.NFFS:
+    NFFS_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.'(CONFIG_FCB || CONFIG_FCB2)':
+    CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
+
+syscfg.vals.REBOOT_LOG_FCB:
+    REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG

Reply via email to