From d8198dd9571e2471169f8eb2fd1eef835889ee82 Mon Sep 17 00:00:00 2001 From: Jakub Zymelka Date: Thu, 26 Sep 2024 12:40:33 +0200 Subject: [PATCH 1/2] [nrf noup] samples: basic: blinky: add eGPIO tests configuration Add overlay for nrf54l15dk to enable eGPIO tests. Signed-off-by: Jakub Zymelka --- .../boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay diff --git a/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay b/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay new file mode 100644 index 00000000000..1c59420d055 --- /dev/null +++ b/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay @@ -0,0 +1,9 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&led0 { + gpios = <&egpio 7 GPIO_ACTIVE_HIGH>; +}; From b278f42e4891ce1fa7df2b20922f778451672a2a Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 30 Sep 2024 14:41:18 +0100 Subject: [PATCH 2/2] [nrf fromlist] sysbuild: cmake: Fix ExternalZephyrProject_Add() revision handling Fixes an issue with HWMv2 boards whereby the specified board revision was not applied at the correct place, which would cause the target image to fail configuration Fixes #79208 Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/79209 Signed-off-by: Jamie McCrae --- .../cmake/modules/sysbuild_extensions.cmake | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake index f0a23a63261..06beea02e37 100644 --- a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake +++ b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake @@ -386,7 +386,22 @@ function(ExternalZephyrProject_Add) # unless _BOARD is defined. if(DEFINED ZBUILD_BOARD_REVISION) # Use provided board revision - set_target_properties(${ZBUILD_APPLICATION} PROPERTIES BOARD ${ZBUILD_BOARD}@${ZBUILD_BOARD_REVISION}) + if(ZBUILD_BOARD MATCHES "/") + # HWMv2 requires adding version to the board, split elements up, attach version, then + # reassemble into a complete string + string(REPLACE "/" ";" split_board_qualifiers "${ZBUILD_BOARD}") + list(GET split_board_qualifiers 0 target_board) + set(target_board ${target_board}@${ZBUILD_BOARD_REVISION}) + list(REMOVE_AT split_board_qualifiers 0) + list(PREPEND split_board_qualifiers ${target_board}) + string(REPLACE ";" "/" board_qualifiers "${split_board_qualifiers}") + set_target_properties(${ZBUILD_APPLICATION} PROPERTIES BOARD ${board_qualifiers}) + set(split_board_qualifiers) + set(board_qualifiers) + else() + # Legacy HWMv1 support, version goes at end + set_target_properties(${ZBUILD_APPLICATION} PROPERTIES BOARD ${ZBUILD_BOARD}@${ZBUILD_BOARD_REVISION}) + endif() else() set_target_properties(${ZBUILD_APPLICATION} PROPERTIES BOARD ${ZBUILD_BOARD}) endif()