zephyr/single_loader: make decription working flash
Decryption buffer was fixed to 1024 which imposes failure
while attempting to decrypt bigger image chunks, which is
expected on memories of bigger erase-block-size.
This patch attempt to get teh proper buffer size basing on
SOC's nv flash node.
fixes #1310
Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
diff --git a/boot/zephyr/single_loader.c b/boot/zephyr/single_loader.c
index 260f9cc..f6c65f6 100644
--- a/boot/zephyr/single_loader.c
+++ b/boot/zephyr/single_loader.c
@@ -221,9 +221,14 @@
}
+/* Get the SOC's flash erase block size from the DTS, fallback to 1024. */
+#define SOC_FLASH_ERASE_BLK_SZ \
+ DT_PROP_OR(DT_CHOSEN(zephyr_flash), erase_block_size,1024)
+
/**
- * reads, decrypts in memory & write back the decrypted image in the same region
- * This function is NOT power failsafe since the image is decrypted in ram (stack)
+ * reads, decrypts in RAM & write back the decrypted image in the same region
+ * This function is NOT power failsafe since the image is decrypted in the RAM
+ * buffer.
*
* @param flash_area The ID of the source flash area.
* @param off_src The offset within the flash area to
@@ -247,7 +252,7 @@
uint32_t blk_sz;
uint8_t image_index;
- static uint8_t buf[1024] __attribute__((aligned));
+ static uint8_t buf[SOC_FLASH_ERASE_BLK_SZ] __attribute__((aligned));
assert(sz <= sizeof buf);
bytes_copied = 0;