boot/zephyr: Fix SINGLE_APPLICATION_SLOT_RAM_LOAD file inclusion (dbbcb78b) · Commits · Wenxi XU / Mcuboot

Tweak if/else chain so that: - single_loader.c and ram_load.c are included if CONFIG_SINGLE_APPLICATION_SLOT_RAM_LOAD=y. - single_loader.c is included if CONFIG_SINGLE_APPLICATION_SLOT=y - ram_load.c is included if CONFIG_BOOT_RAM_LOAD=y and CONFIG_SINGLE_APPLICATION_SLOT_RAM_LOAD=n and CONFIG_SINGLE_APPLICATION_SLOT=n. Without this patch, having both CONFIG_SINGLE_APPLICATION_SLOT_RAM_LOAD and CONFIG_SINGLE_APPLICATION_SLOT would not include ram_load.c. Signed-off-by:

Ederson de Souza <ederson.desouza@intel.com>

boot/zephyr/CMakeLists.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -125,15 +125,15 @@ zephyr_library_sources(
		)
		endif()

		if(CONFIG_SINGLE_APPLICATION_SLOT)
		if(CONFIG_SINGLE_APPLICATION_SLOT_RAM_LOAD)
		zephyr_library_sources(
		${BOOT_DIR}/zephyr/single_loader.c
		${BOOT_DIR}/bootutil/src/ram_load.c
		)
		zephyr_library_include_directories(${BOOT_DIR}/bootutil/src)
		elseif(CONFIG_SINGLE_APPLICATION_SLOT OR CONFIG_SINGLE_APPLICATION_SLOT_RAM_LOAD)
		elseif(CONFIG_SINGLE_APPLICATION_SLOT)
		zephyr_library_sources(
		${BOOT_DIR}/zephyr/single_loader.c
		${BOOT_DIR}/bootutil/src/ram_load.c
		)
		zephyr_library_include_directories(${BOOT_DIR}/bootutil/src)
		elseif(CONFIG_BOOT_FIRMWARE_LOADER)
		@@ -161,7 +161,7 @@ else()
		${BOOT_DIR}/bootutil/src/swap_scratch.c
		)

		if(CONFIG_BOOT_RAM_LOAD OR CONFIG_SINGLE_APPLICATION_SLOT_RAM_LOAD)
		if(CONFIG_BOOT_RAM_LOAD)
		zephyr_library_sources(
		${BOOT_DIR}/bootutil/src/ram_load.c
		)

Admin message