boot: Fix ifdefs in DIRECT_XIP and RAM_LOAD case (94ed12c4) · Commits · Wenxi XU / Mcuboot

The function `boot_erase_region` is used in some cases when DIRECT_XIP or RAM_LOAD are defined, however it is specifically not compiled in in these cases. Correct the ifdefs so this function will be available. Signed-off-by:

David Brown <david.brown@linaro.org>

boot/bootutil/src/loader.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -857,6 +857,7 @@ boot_validated_swap_type(struct boot_loader_state *state,

		return swap_type;
		}
		#endif

		/**
		* Erases a region of flash.
		@@ -874,6 +875,7 @@ boot_erase_region(const struct flash_area *fap, uint32_t off, uint32_t sz)
		return flash_area_erase(fap, off, sz);
		}

		#if !defined(MCUBOOT_DIRECT_XIP) && !defined(MCUBOOT_RAM_LOAD)
		/**
		* Copies the contents of one flash region to another. You must erase the
		* destination region prior to calling this function.

Admin message