[nrf fromtree] fs/fcb: Replace flash_area_erase with flash_area_flatten

de-nordic · rghaddab · commit 51246fa83aea · 2024-09-25T17:00:10.000+02:00
FCB depends on explicit erase characteristics of a device. Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no> (cherry picked from commit 64ccfb0)
diff --git a/subsys/fs/fcb/fcb.c b/subsys/fs/fcb/fcb.c
@@ -82,8 +82,7 @@ fcb_erase_sector(const struct fcb *fcb, const struct flash_sector *sector)
 		return -EIO;
 	}
 
-	rc = flash_area_erase(fcb->fap, sector->fs_off, sector->fs_size);
-
+	rc = flash_area_flatten(fcb->fap, sector->fs_off, sector->fs_size);
 	if (rc != 0) {
 		return -EIO;
 	}
diff --git a/tests/subsys/fs/fcb/testcase.yaml b/tests/subsys/fs/fcb/testcase.yaml
@@ -12,6 +12,12 @@ tests:
     tags: flash_circural_buffer
     integration_platforms:
       - nrf52840dk/nrf52840
+  filesystem.fcb.no_erase:
+    platform_allow:
+      - nrf54l15pdk/nrf54l15/cpuapp
+  filesystem.fcb.native_sim.no_erase:
+    extra_args: CONFIG_FLASH_SIMULATOR_EXPLICIT_ERASE=n
+    platform_allow: native_sim
   filesystem.fcb.native_sim.fcb_0x00:
     extra_args: DTC_OVERLAY_FILE=boards/native_sim_ev_0x00.overlay
     platform_allow: native_sim

Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,7 @@ fcb_erase_sector(const struct fcb fcb, const struct flash_sector sector)`
`82`	`82`	`return -EIO;`
`83`	`83`	`}`
`84`	`84`
`85`		`- rc = flash_area_erase(fcb->fap, sector->fs_off, sector->fs_size);`
`86`		`-`
	`85`	`+ rc = flash_area_flatten(fcb->fap, sector->fs_off, sector->fs_size);`
`87`	`86`	`if (rc != 0) {`
`88`	`87`	`return -EIO;`
`89`	`88`	`}`