Skip to content

Commit 6f5c90c

Browse files
masz-nordicrlubos
authored andcommitted
cmake: sysbuild: sdp: cleanup and simplify
Use a common function for all cases. This will scale better for future SDPs. Signed-off-by: Marcin Szymczyk <[email protected]>
1 parent 2f8c198 commit 6f5c90c

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

cmake/sysbuild/sdp.cmake

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,23 @@
22
#
33
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
44

5-
function(sdp_apply_overlays)
6-
if(SB_CONFIG_EGPIO_BACKEND_MBOX)
7-
sysbuild_cache_set(VAR ${DEFAULT_IMAGE}_SNIPPET APPEND REMOVE_DUPLICATES "sdp-gpio-mbox")
8-
elseif(SB_CONFIG_EGPIO_BACKEND_ICMSG)
9-
sysbuild_cache_set(VAR ${DEFAULT_IMAGE}_SNIPPET APPEND REMOVE_DUPLICATES "sdp-gpio-icmsg")
10-
sysbuild_cache_set(VAR sdp_SNIPPET APPEND REMOVE_DUPLICATES "sdp-gpio-icmsg")
11-
elseif(SB_CONFIG_EGPIO_BACKEND_ICBMSG)
12-
sysbuild_cache_set(VAR ${DEFAULT_IMAGE}_SNIPPET APPEND REMOVE_DUPLICATES "sdp-gpio-icbmsg")
13-
sysbuild_cache_set(VAR sdp_SNIPPET APPEND REMOVE_DUPLICATES "sdp-gpio-icbmsg")
14-
endif()
5+
# Apply snippet to both images. Assumption is that SDP image is called 'sdp'.
6+
function(sdp_apply_snippets snippet)
7+
sysbuild_cache_set(VAR ${DEFAULT_IMAGE}_SNIPPET APPEND REMOVE_DUPLICATES ${snippet})
8+
sysbuild_cache_set(VAR sdp_SNIPPET APPEND REMOVE_DUPLICATES ${snippet})
159
endfunction()
1610

1711
if(SB_CONFIG_SDP)
1812
if(SB_CONFIG_SDP_GPIO)
19-
sdp_apply_overlays()
13+
if(SB_CONFIG_SDP_GPIO_BACKEND_MBOX)
14+
set(snippet_name "sdp-gpio-mbox")
15+
elseif(SB_CONFIG_SDP_GPIO_BACKEND_ICMSG)
16+
set(snippet_name "sdp-gpio-icmsg")
17+
elseif(SB_CONFIG_SDP_GPIO_BACKEND_ICBMSG)
18+
set(snippet_name "sdp-gpio-icbmsg")
19+
endif()
2020
endif()
21+
22+
sdp_apply_snippets(${snippet_name})
23+
set(snippet_name)
2124
endif()

0 commit comments

Comments
 (0)