Skip to content

Commit dbbcb78

Browse files
edersondisouzanordicjm
authored andcommitted
boot/zephyr: Fix SINGLE_APPLICATION_SLOT_RAM_LOAD file inclusion
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 <[email protected]>
1 parent 9e72eb3 commit dbbcb78

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

boot/zephyr/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,15 @@ zephyr_library_sources(
125125
)
126126
endif()
127127

128-
if(CONFIG_SINGLE_APPLICATION_SLOT)
128+
if(CONFIG_SINGLE_APPLICATION_SLOT_RAM_LOAD)
129129
zephyr_library_sources(
130130
${BOOT_DIR}/zephyr/single_loader.c
131+
${BOOT_DIR}/bootutil/src/ram_load.c
131132
)
132133
zephyr_library_include_directories(${BOOT_DIR}/bootutil/src)
133-
elseif(CONFIG_SINGLE_APPLICATION_SLOT OR CONFIG_SINGLE_APPLICATION_SLOT_RAM_LOAD)
134+
elseif(CONFIG_SINGLE_APPLICATION_SLOT)
134135
zephyr_library_sources(
135136
${BOOT_DIR}/zephyr/single_loader.c
136-
${BOOT_DIR}/bootutil/src/ram_load.c
137137
)
138138
zephyr_library_include_directories(${BOOT_DIR}/bootutil/src)
139139
elseif(CONFIG_BOOT_FIRMWARE_LOADER)
@@ -161,7 +161,7 @@ else()
161161
${BOOT_DIR}/bootutil/src/swap_scratch.c
162162
)
163163

164-
if(CONFIG_BOOT_RAM_LOAD OR CONFIG_SINGLE_APPLICATION_SLOT_RAM_LOAD)
164+
if(CONFIG_BOOT_RAM_LOAD)
165165
zephyr_library_sources(
166166
${BOOT_DIR}/bootutil/src/ram_load.c
167167
)

0 commit comments

Comments
 (0)