Revert a clean up 'fix' which actually broke FPGA upload.

1 files changed, 7 insertions, 2 deletions

diff --git a/projects/hsm/mgmt-fpga.c b/projects/hsm/mgmt-fpga.c
index b535b1d..af7ba11 100644
--- a/projects/hsm/mgmt-fpga.c
+++ b/projects/hsm/mgmt-fpga.c
@@ -64,8 +64,13 @@ static HAL_StatusTypeDef _flash_write_callback(uint8_t *buf, size_t len)
 	if ((res = fpgacfg_erase_sector(dfu_offset / FPGACFG_SECTOR_SIZE)) != CMSIS_HAL_OK)
 	    return res;
 
-    res = fpgacfg_write_data(dfu_offset, buf, len);
-    dfu_offset += len;
+    /* fpgacfg_write_data (a thin wrapper around n25q128_write_data)
+     * requires the offset and length to be page-aligned. The last chunk
+     * will be short, so we pad it out to the full chunk size.
+     */
+    len = len;
+    res = fpgacfg_write_data(dfu_offset, buf, BITSTREAM_UPLOAD_CHUNK_SIZE);
+    dfu_offset += BITSTREAM_UPLOAD_CHUNK_SIZE;
     return res;
 }