Infineon: Switch to 1.9.0 code base, add xmc7000 family support, refactor memory layer
diff --git a/sim/mcuboot-sys/csupport/devicetree.h b/sim/mcuboot-sys/csupport/devicetree.h
index 22a7fe6..3c96493 100644
--- a/sim/mcuboot-sys/csupport/devicetree.h
+++ b/sim/mcuboot-sys/csupport/devicetree.h
@@ -20,7 +20,8 @@
#define FLASH_AREA_ID_image_3 5
/*
- * PSoC6 area defines based on file:
+ * Flash area defines are calculated inside of FLASH_AREA_IMAGE_PRIMARY()
+ * and FLASH_AREA_IMAGE_SECONDARY(), file
* boot/cypress/MCUBootApp/sysflash/sysflash.h
*/
#define FLASH_AREA_IMAGE_0 1
diff --git a/sim/mcuboot-sys/csupport/run.c b/sim/mcuboot-sys/csupport/run.c
index fd6c3ca..07b09ad 100644
--- a/sim/mcuboot-sys/csupport/run.c
+++ b/sim/mcuboot-sys/csupport/run.c
@@ -43,7 +43,7 @@
uint32_t size);
extern int sim_flash_write(uint8_t flash_id, uint32_t offset, const uint8_t *src,
uint32_t size);
-extern uint16_t sim_flash_align(uint8_t flash_id);
+extern uint32_t sim_flash_align(uint8_t flash_id);
extern uint8_t sim_flash_erased_val(uint8_t flash_id);
struct sim_context {
@@ -222,7 +222,7 @@
#endif
}
-size_t flash_area_align(const struct flash_area *area)
+uint32_t flash_area_align(const struct flash_area *area)
{
return (size_t)sim_flash_align(area->fa_device_id);
}
@@ -245,7 +245,7 @@
};
int invoke_boot_go(struct sim_context *ctx, struct area_desc *adesc,
- struct boot_rsp *rsp)
+ struct boot_rsp *rsp, int image_id)
{
int res;
struct boot_loader_state *state;
@@ -257,14 +257,28 @@
mbedtls_platform_set_calloc_free(calloc, free);
#endif
- // NOTE: cleared internally by context_boot_go
state = malloc(sizeof(struct boot_loader_state));
sim_set_flash_areas(adesc);
sim_set_context(ctx);
if (setjmp(ctx->boot_jmpbuf) == 0) {
- res = context_boot_go(state, rsp);
+ boot_state_clear(state);
+
+#if BOOT_IMAGE_NUMBER > 1
+ if (image_id >= 0) {
+ memset(state->img_mask, 1, sizeof(state->img_mask));
+ state->img_mask[image_id] = 0;
+ }
+#else
+ (void) image_id;
+#endif /* BOOT_IMAGE_NUMBER > 1 */
+
+#if defined(MCUBOOT_RAM_LOAD)
+ res = context_boot_go_ram(state, rsp);
+#else
+ res = context_boot_go_flash(state, rsp);
+#endif
sim_reset_flash_areas();
sim_reset_context();
free(state);
@@ -357,8 +371,8 @@
// Align offset and length to sector size
#ifdef MCUBOOT_SWAP_USING_STATUS
- uint32_t sect_off = off / CY_FLASH_ALIGN * CY_FLASH_ALIGN;
- len = ((off + len - 1) / CY_FLASH_ALIGN + 1) * CY_FLASH_ALIGN - sect_off;
+ uint32_t sect_off = off / MEMORY_ALIGN * MEMORY_ALIGN;
+ len = ((off + len - 1) / MEMORY_ALIGN + 1) * MEMORY_ALIGN - sect_off;
off = sect_off;
BOOT_LOG_SIM("%s: erase with aligment at area=%d, off=%x, len=%x", __func__, area->fa_id, off, len);
#endif
@@ -476,5 +490,5 @@
uint32_t boot_magic_sz(void)
{
- return BOOT_MAGIC_SZ;
+ return BOOT_MAGIC_ALIGN_SIZE;
}
diff --git a/sim/mcuboot-sys/csupport/storage/flash_map.h b/sim/mcuboot-sys/csupport/storage/flash_map.h
index 7b20453..2438f70 100644
--- a/sim/mcuboot-sys/csupport/storage/flash_map.h
+++ b/sim/mcuboot-sys/csupport/storage/flash_map.h
@@ -124,7 +124,7 @@
/*
* Alignment restriction for flash writes.
*/
-size_t flash_area_align(const struct flash_area *);
+uint32_t flash_area_align(const struct flash_area *);
/*
* What is value is read from erased flash bytes.