diff options
author | Tamas Ban <tamas.ban@arm.com> | 2020-09-11 15:25:48 +0100 |
---|---|---|
committer | Tamas Ban <tamas.ban@arm.com> | 2020-09-30 08:07:38 +0000 |
commit | 0bd0dfce05d12d1bf51f714de606bb56f159b3ad (patch) | |
tree | a2ece13835411ce614c3c27a03688a5b95e9368b /bl2 | |
parent | 4b2d5a20a3dec21c42c4c34783d13588a105d9ef (diff) | |
download | trusted-firmware-m-0bd0dfce05d12d1bf51f714de606bb56f159b3ad.tar.gz |
Boot: Rename NO_SWAP upgrade strategy to DIRECT_XIP
The NO_SWAP upgrade strategy was upstreamed to the mainline
MCUboot repo, but the feature was renamed to DIRECT_XIP.
This change do the same renaming in TF-M to be aligned with
the mainline repo, because the MCUboot fork is going to be
removed from the TF-M repository.
Change-Id: I63201a5319a68394d45d753a700444cdc848b5dc
Signed-off-by: Tamas Ban <tamas.ban@arm.com>
Diffstat (limited to 'bl2')
-rw-r--r-- | bl2/ext/mcuboot/boot/bootutil/src/loader.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bl2/ext/mcuboot/boot/bootutil/src/loader.c b/bl2/ext/mcuboot/boot/bootutil/src/loader.c index a3fea2e0b4..e340b44278 100644 --- a/bl2/ext/mcuboot/boot/bootutil/src/loader.c +++ b/bl2/ext/mcuboot/boot/bootutil/src/loader.c @@ -55,7 +55,7 @@ static struct boot_loader_state boot_data; #define IMAGES_ITER(x) #endif -#if !defined(MCUBOOT_NO_SWAP) && !defined(MCUBOOT_RAM_LOADING) && \ +#if !defined(MCUBOOT_DIRECT_XIP) && !defined(MCUBOOT_RAM_LOADING) && \ !defined(MCUBOOT_OVERWRITE_ONLY) #if defined(MCUBOOT_VALIDATE_PRIMARY_SLOT) && !defined(MCUBOOT_OVERWRITE_ONLY) @@ -160,7 +160,7 @@ static const struct boot_status_table boot_status_tables[] = { (state)->swap_type, \ (state)->copy_done, \ (state)->image_ok) -#endif /* !MCUBOOT_NO_SWAP && !MCUBOOT_RAM_LOADING && !MCUBOOT_OVERWRITE_ONLY */ +#endif /* !MCUBOOT_DIRECT_XIP && !MCUBOOT_RAM_LOADING && !MCUBOOT_OVERWRITE_ONLY */ /* * \brief Verifies the image header: magic value, flags, integer overflow. @@ -537,7 +537,7 @@ done: return rc; } -#if !defined(MCUBOOT_NO_SWAP) && !defined(MCUBOOT_OVERWRITE_ONLY) +#if !defined(MCUBOOT_DIRECT_XIP) && !defined(MCUBOOT_OVERWRITE_ONLY) /* * Compute the total size of the given image. Includes the size of * the TLVs. @@ -598,9 +598,9 @@ done: flash_area_close(fap); return rc; } -#endif /* !MCUBOOT_NO_SWAP && !MCUBOOT_OVERWRITE_ONLY */ +#endif /* !MCUBOOT_DIRECT_XIP && !MCUBOOT_OVERWRITE_ONLY */ -#if !defined(MCUBOOT_NO_SWAP) && !defined(MCUBOOT_RAM_LOADING) +#if !defined(MCUBOOT_DIRECT_XIP) && !defined(MCUBOOT_RAM_LOADING) /* * Slots are compatible when all sectors that store up to to size of the image * round up to sector size, in both slot's are able to fit in the scratch @@ -2395,7 +2395,7 @@ out: return rc; } -#else /* MCUBOOT_NO_SWAP || MCUBOOT_RAM_LOADING */ +#else /* MCUBOOT_DIRECT_XIP || MCUBOOT_RAM_LOADING */ #define BOOT_LOG_IMAGE_INFO(area, hdr, state) \ BOOT_LOG_INF("Image %u: version=%u.%u.%u+%u, magic=%5s, image_ok=0x%x", \ @@ -2834,7 +2834,7 @@ out: } return rc; } -#endif /* MCUBOOT_NO_SWAP || MCUBOOT_RAM_LOADING */ +#endif /* MCUBOOT_DIRECT_XIP || MCUBOOT_RAM_LOADING */ int boot_go(struct boot_rsp *rsp) |