[nrf toup] Factory data partition location change

- factory data can be placed before or after settings partition

Signed-off-by: Konrad Grucel <[email protected]>

config/nrfconnect/chip-module/Kconfig

@@ -415,5 +415,4 @@ config CHIP_ENABLE_BDX_LOG_TRANSFER
 	bool "Enable BDX transfer for diagnostic logs"
 	help
 	  Enables the BDX protocol for diagnostics log transfer purposes.
-
 endif # CHIP

src/platform/nrfconnect/FactoryDataProvider.h

@@ -72,15 +72,26 @@ struct InternalFlashFactoryData
 
     constexpr size_t FactoryDataBlockSize()
     {
-        // calculate the factory data end address rounded up to the nearest multiple of CONFIG_FPROTECT_BLOCK_SIZE
+        // calculate the factory data and settings end address rounded up to the nearest multiple of CONFIG_FPROTECT_BLOCK_SIZE
         // and make sure we do not overlap with settings partition
         constexpr size_t kFactoryDataBlockEnd =
             (FACTORY_DATA_ADDRESS + FACTORY_DATA_SIZE + CONFIG_FPROTECT_BLOCK_SIZE - 1) & (-CONFIG_FPROTECT_BLOCK_SIZE);
-        static_assert(kFactoryDataBlockEnd <= PM_SETTINGS_STORAGE_ADDRESS,
+
+        constexpr size_t SettingsBlockEnd =
+            (PM_SETTINGS_STORAGE_ADDRESS + PM_SETTINGS_STORAGE_SIZE + CONFIG_FPROTECT_BLOCK_SIZE - 1) &
+            (-CONFIG_FPROTECT_BLOCK_SIZE);
+
+        constexpr size_t kFactoryDataBlockBegin = FACTORY_DATA_ADDRESS & (-CONFIG_FPROTECT_BLOCK_SIZE);
+
+        constexpr bool overlapsCheck =
+            (SettingsBlockEnd <= kFactoryDataBlockBegin) || (kFactoryDataBlockEnd <= PM_SETTINGS_STORAGE_ADDRESS);
+
+        static_assert(overlapsCheck,
                       "FPROTECT memory block, which contains factory data"
                       "partition overlaps with the settings partition."
                       "Probably your settings partition size is not a multiple"
                       "of the atomic FPROTECT block size of " TO_STR(CONFIG_FPROTECT_BLOCK_SIZE) "kB");
+
         return kFactoryDataBlockEnd - FactoryDataBlockBegin();
     }
 #undef TO_STR
@@ -95,7 +106,10 @@ struct InternalFlashFactoryData
 #endif // if CONFIG_FPROTECT
     }
 #else
-    CHIP_ERROR ProtectFactoryDataPartitionAgainstWrite() { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR ProtectFactoryDataPartitionAgainstWrite()
+    {
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    }
 #endif
 };