Bluetooth: Mesh: Deprecate blob_io_flash erase cap options

The only reason to keep these would be to enable conditional compilation
of some parts of the code. However, we can't see enough benefit in doing
this, particularly since the flash driver itself will conditionally
handle certain paths depending on erase caps, so the options are
deprecated to reduce complexity.

Signed-off-by: Ludvig Jordet <[email protected]>

Author: ludvigsj

subsys/bluetooth/mesh/Kconfig

@@ -1038,43 +1038,36 @@ config BT_MESH_BLOB_IO_FLASH
 	default y
 	depends on BT_MESH_BLOB_SRV || BT_MESH_BLOB_CLI
 	depends on FLASH_MAP
+	depends on FLASH_PAGE_LAYOUT
 	help
 	  Enable the BLOB flash stream for reading and writing BLOBs directly to
 	  and from flash.
 
 if BT_MESH_BLOB_IO_FLASH
 
 config BT_MESH_BLOB_IO_FLASH_WITHOUT_ERASE
-	bool "BLOB flash support for devices without erase"
-	default y if FLASH_HAS_NO_EXPLICIT_ERASE
+	bool "BLOB flash support for devices without erase [DEPRECATED]"
+	default n
 	depends on FLASH_HAS_NO_EXPLICIT_ERASE
+	select DEPRECATED
 	help
-	  Enable path supporting devices without erase. This option appears only
-	  if there are devices without explicit erase requirements in the system
-	  and may be disabled to reduce code size in case when no operations
-	  are intended on such type of devices.
+	  This option is deprecated and is no longer used by the BLOB IO Flash module.
 
 config BT_MESH_BLOB_IO_FLASH_WITH_ERASE
-	bool "BLOB flash support for devices with erase"
-	default y if FLASH_HAS_EXPLICIT_ERASE
+	bool "BLOB flash support for devices with erase [DEPRECATED]"
+	default n
 	depends on FLASH_HAS_EXPLICIT_ERASE
 	depends on FLASH_PAGE_LAYOUT
+	select DEPRECATED
 	help
-	  Enable path supporting devices with erase. This option appears only
-	  if there are devices requiring erase,  before write, in the system
-	  and may be disabled to reduce code size in case when no operations
-	  are intended on such type of devices.
-
-if BT_MESH_BLOB_IO_FLASH_WITH_ERASE
+	  This option is deprecated and is no longer used by the BLOB IO Flash module.
 
 config BT_MESH_BLOB_IO_FLASH_WRITE_BLOCK_SIZE_MAX
 	int "Maximum supported write block size"
 	default 4
 	help
 	  The BLOB IO Flash module will support flash devices with explicit erase
-	  using a write block size of at most this value.
-
-endif # BT_MESH_BLOB_IO_FLASH_WITH_ERASE
+	  when this value is set to a multiple of the device write block size.
 
 endif # BT_MESH_BLOB_IO_FLASH
 

subsys/bluetooth/mesh/blob_io_flash.c

@@ -70,8 +70,6 @@ static void io_close(const struct bt_mesh_blob_io *io,
 	flash_area_close(flash->area);
 }
 
-/* Erasure code not needed if no flash in the system requires explicit erase */
-#ifdef CONFIG_BT_MESH_BLOB_IO_FLASH_WITH_ERASE
 static inline int erase_device_block(const struct flash_area *fa, off_t start, size_t size)
 {
 	const struct device *fdev = flash_area_get_device(fa);
@@ -82,15 +80,12 @@ static inline int erase_device_block(const struct flash_area *fa, off_t start, s
 		return -ENODEV;
 	}
 
-#ifdef CONFIG_BT_MESH_BLOB_IO_FLASH_WITHOUT_ERASE
-	/* We have a mix of devices in system */
 	const struct flash_parameters *fparam = flash_get_parameters(fdev);
 
 	/* If device has no erase requirement then do nothing */
 	if (!(flash_params_get_erase_cap(fparam) & FLASH_ERASE_C_EXPLICIT)) {
 		return 0;
 	}
-#endif /* CONFIG_BT_MESH_BLOB_IO_FLASH_WITHOUT_ERASE */
 
 	err = flash_get_page_info_by_offs(fdev, start, &page);
 	if (err) {
@@ -120,7 +115,6 @@ static int block_start(const struct bt_mesh_blob_io *io,
 
 	return erase_device_block(flash->area, flash->offset + block->offset, block->size);
 }
-#endif /* CONFIG_BT_MESH_BLOB_IO_FLASH_WITH_ERASE */
 
 static int rd_chunk(const struct bt_mesh_blob_io *io,
 		    const struct bt_mesh_blob_xfer *xfer,
@@ -199,11 +193,7 @@ int bt_mesh_blob_io_flash_init(struct bt_mesh_blob_io_flash *flash,
 	flash->offset = offset;
 	flash->io.open = io_open;
 	flash->io.close = io_close;
-#ifdef CONFIG_BT_MESH_BLOB_IO_FLASH_WITH_ERASE
 	flash->io.block_start = block_start;
-#else
-	flash->io.block_start = NULL;
-#endif
 	flash->io.block_end = NULL;
 	flash->io.rd = rd_chunk;
 	flash->io.wr = wr_chunk;