TODO BACKPORT IN INITIAL COMMITS firmware: fix support for bigger fla…

…sh pages

Fix support when FIRMWARE_METADATA_SIZE < FLASHPAGE_SIZE.

sys/firmware/firmware_flashwrite.c

@@ -37,9 +37,10 @@ int firmware_flashwrite_init(firmware_flashwrite_t *state, int target_slot,
 
     memset(state, 0, sizeof(firmware_flashwrite_t));
 
-    state->offset = offset;
+    state->offset = offset % FLASHPAGE_SIZE;
     state->target_slot = target_slot;
     state->flashpage = flashpage_page(firmware_get_metadata(target_slot));
+    state->flashpage += offset / FLASHPAGE_SIZE;
 
     return 0;
 }

sys/firmware/firmware_manifest.c

@@ -199,7 +199,6 @@ static ssize_t fetch_block(firmware_manifest_t *state, unsigned num, sock_udp_ep
 
         if (block2.offset == 0) {
             firmware_flashwrite_init(&_fw_man.writer, firmware_target_slot(), FIRMWARE_METADATA_SIZE);
-            _fw_man.writer.flashpage++;
         }
         if (block2.offset + pkt.payload_len > _fw_man.manifest.size) {
             LOG_ERROR("ota: received firmware larger than expected: %u, aborting\n", block2.offset + pkt.payload_len);