michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: boot: mcuboot_recovery_retention: rm OVERLAY_CONFIG

Browse source 
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 <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2025-03-24 14:17:52 +01:00 • committed by Benjamin Cabé
commit fd3f93ac53
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/boot/mcuboot_recovery_retention/sysbuild.cmake
View file

@ -1,9 +1,9 @@
set(mcuboot_EXTRA_ZEPHYR_MODULES "${CMAKE_CURRENT_LIST_DIR}/test_module" CACHE INTERNAL "test_module directory") set(mcuboot_EXTRA_ZEPHYR_MODULES "${CMAKE_CURRENT_LIST_DIR}/test_module" CACHE INTERNAL "test_module directory")
if(DEFINED mcuboot_TARGET_OVERLAY_CONFIG) if(DEFINED mcuboot_TARGET_EXTRA_CONF_FILE)
list(APPEND mcuboot_OVERLAY_CONFIG "${CMAKE_CURRENT_LIST_DIR}/sysbuild/mcuboot/${mcuboot_TARGET_OVERLAY_CONFIG}") list(APPEND mcuboot_EXTRA_CONF_FILE "${CMAKE_CURRENT_LIST_DIR}/sysbuild/mcuboot/${mcuboot_TARGET_EXTRA_CONF_FILE}")
list(REMOVE_DUPLICATES mcuboot_OVERLAY_CONFIG) list(REMOVE_DUPLICATES mcuboot_EXTRA_CONF_FILE)
set(mcuboot_OVERLAY_CONFIG "${mcuboot_OVERLAY_CONFIG}" CACHE INTERNAL "") set(mcuboot_EXTRA_CONF_FILE "${mcuboot_EXTRA_CONF_FILE}" CACHE INTERNAL "")
endif() endif()
if(DEFINED mcuboot_TARGET_DTC_OVERLAY_FILE) if(DEFINED mcuboot_TARGET_DTC_OVERLAY_FILE)

2
tests/boot/mcuboot_recovery_retention/testcase.yaml
View file

@ -30,7 +30,7 @@ tests:
extra_args: extra_args:
- EXTRA_CONF_FILE="boards/nrf52840dk_nrf52840_mem.conf" - EXTRA_CONF_FILE="boards/nrf52840dk_nrf52840_mem.conf"
- DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_mem.overlay" - DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_mem.overlay"
- mcuboot_TARGET_OVERLAY_CONFIG="boards/nrf52840dk_nrf52840_mem.conf" - mcuboot_TARGET_EXTRA_CONF_FILE="boards/nrf52840dk_nrf52840_mem.conf"
- mcuboot_TARGET_DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_mem.overlay" - mcuboot_TARGET_DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_mem.overlay"
tags: tags:
- mcuboot - mcuboot