Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport v3.4-branch] tests: boot: mcuboot_recovery_retention: Fix configuration issue #60641

Merged
merged 1 commit into from
Aug 7, 2023
Merged

[Backport v3.4-branch] tests: boot: mcuboot_recovery_retention: Fix configuration issue #60641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions tests/boot/mcuboot_recovery_retention/sysbuild.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
set(mcuboot_EXTRA_ZEPHYR_MODULES "${CMAKE_CURRENT_LIST_DIR}/test_module" CACHE INTERNAL "test_module directory")

if(DEFINED mcuboot_TARGET_OVERLAY_CONFIG)
list(APPEND mcuboot_OVERLAY_CONFIG "${CMAKE_CURRENT_LIST_DIR}/sysbuild/mcuboot/${mcuboot_TARGET_OVERLAY_CONFIG}")
list(REMOVE_DUPLICATES mcuboot_OVERLAY_CONFIG)
set(mcuboot_OVERLAY_CONFIG "${mcuboot_OVERLAY_CONFIG}" CACHE INTERNAL "")
endif()

if(DEFINED mcuboot_TARGET_DTC_OVERLAY_FILE)
list(APPEND mcuboot_DTC_OVERLAY_FILE "${CMAKE_CURRENT_LIST_DIR}/sysbuild/mcuboot/${mcuboot_TARGET_DTC_OVERLAY_FILE}")
list(REMOVE_DUPLICATES mcuboot_DTC_OVERLAY_FILE)
set(mcuboot_DTC_OVERLAY_FILE "${mcuboot_DTC_OVERLAY_FILE}" CACHE INTERNAL "")
endif()
7 changes: 7 additions & 0 deletions tests/boot/mcuboot_recovery_retention/sysbuild/mcuboot/boards/nrf52840dk_nrf52840_mem.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#
# Copyright (c) 2023 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: Apache-2.0
#
CONFIG_RETAINED_MEM_NRF_GPREGRET=n
CONFIG_RETAINED_MEM_ZEPHYR_RAM=y
14 changes: 14 additions & 0 deletions ...s/boot/mcuboot_recovery_retention/sysbuild/mcuboot/boards/nrf52840dk_nrf52840_mem.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/* SPDX-License-Identifier: Apache-2.0 */
#include "../../../boards/nrf52840dk_nrf52840_mem.overlay"

/ {
chosen {
zephyr,code-partition = &boot_partition;
};
};

&zephyr_udc0 {
cdc_acm_uart0 {
compatible = "zephyr,cdc-acm-uart";
};
};
6 changes: 4 additions & 2 deletions tests/boot/mcuboot_recovery_retention/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ tests:
mcuboot.recovery.retention.mem:
platform_allow: nrf52840dk_nrf52840
extra_args:
- "'OVERLAY_CONFIG=\"nrf52840dk_nrf52840_mem.conf\"'"
- "'DTC_OVERLAY_FILE=\"boards/nrf52840dk_nrf52840_mem.overlay\"'"
- OVERLAY_CONFIG="boards/nrf52840dk_nrf52840_mem.conf"
- DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_mem.overlay"
- mcuboot_TARGET_OVERLAY_CONFIG="boards/nrf52840dk_nrf52840_mem.conf"
- mcuboot_TARGET_DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_mem.overlay"
tags:
- mcuboot
- sysbuild
Expand Down