Skip to content

Commit fd3f93a

Browse files
Thalleykartben
authored andcommitted
tests: boot: mcuboot_recovery_retention: rm OVERLAY_CONFIG
Replace uses of OVERLAY_CONFIG with EXTRA_CONF_FILE to follow the rest of Zephyr where OVERLAY_CONFIG was deprecated in favor of EXTRA_CONF_FILE. Signed-off-by: Emil Gydesen <[email protected]>
1 parent 4925e22 commit fd3f93a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

tests/boot/mcuboot_recovery_retention/sysbuild.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
set(mcuboot_EXTRA_ZEPHYR_MODULES "${CMAKE_CURRENT_LIST_DIR}/test_module" CACHE INTERNAL "test_module directory")
22

3-
if(DEFINED mcuboot_TARGET_OVERLAY_CONFIG)
4-
list(APPEND mcuboot_OVERLAY_CONFIG "${CMAKE_CURRENT_LIST_DIR}/sysbuild/mcuboot/${mcuboot_TARGET_OVERLAY_CONFIG}")
5-
list(REMOVE_DUPLICATES mcuboot_OVERLAY_CONFIG)
6-
set(mcuboot_OVERLAY_CONFIG "${mcuboot_OVERLAY_CONFIG}" CACHE INTERNAL "")
3+
if(DEFINED mcuboot_TARGET_EXTRA_CONF_FILE)
4+
list(APPEND mcuboot_EXTRA_CONF_FILE "${CMAKE_CURRENT_LIST_DIR}/sysbuild/mcuboot/${mcuboot_TARGET_EXTRA_CONF_FILE}")
5+
list(REMOVE_DUPLICATES mcuboot_EXTRA_CONF_FILE)
6+
set(mcuboot_EXTRA_CONF_FILE "${mcuboot_EXTRA_CONF_FILE}" CACHE INTERNAL "")
77
endif()
88

99
if(DEFINED mcuboot_TARGET_DTC_OVERLAY_FILE)

tests/boot/mcuboot_recovery_retention/testcase.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ tests:
3030
extra_args:
3131
- EXTRA_CONF_FILE="boards/nrf52840dk_nrf52840_mem.conf"
3232
- DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_mem.overlay"
33-
- mcuboot_TARGET_OVERLAY_CONFIG="boards/nrf52840dk_nrf52840_mem.conf"
33+
- mcuboot_TARGET_EXTRA_CONF_FILE="boards/nrf52840dk_nrf52840_mem.conf"
3434
- mcuboot_TARGET_DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_mem.overlay"
3535
tags:
3636
- mcuboot

0 commit comments

Comments
 (0)