Skip to content

Commit 7cfddbb

Browse files
nordicjmnordicjm
committed
sysbuild: Minimise network core Kconfigs and image selection
Makes selecting the network core image easier and allows for expansion by other modules by reducing multiple copies of the same code which was checking for hard-coded image names Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
1 parent c1c4c42 commit 7cfddbb

File tree

3 files changed

+38
-265
lines changed

3 files changed

+38
-265
lines changed

‎sysbuild/CMakeLists.txt

+5-42
Original file line numberDiff line numberDiff line change
@@ -305,48 +305,11 @@ include(${CMAKE_CURRENT_LIST_DIR}/extensions.cmake)
305305

306306
if(SB_CONFIG_SECURE_BOOT)
307307
set(secure_boot_image_dir ${ZEPHYR_NRF_MODULE_DIR}/subsys/bootloader/image)
308-
if(SB_CONFIG_SECURE_BOOT_NETCORE)
309-
if(SB_CONFIG_NETCORE_HCI_RPMSG)
310-
add_overlay_config(
311-
${SB_CONFIG_NETCORE_HCI_RPMSG_NAME} # ToDo: Create a common Kconfig setting
312-
# which can then default to the exact
313-
# remote image selected, as to work for
314-
# hci, mpsl, thread, etc.
315-
"${secure_boot_image_dir}/secure_boot.conf"
316-
)
317-
elseif(SB_CONFIG_NETCORE_802154_RPMSG)
318-
add_overlay_config(
319-
${SB_CONFIG_NETCORE_802154_RPMSG_NAME} # ToDo: Create a common Kconfig setting
320-
# which can then default to the exact
321-
# remote image selected, as to work for
322-
# hci, mpsl, thread, etc.
323-
"${secure_boot_image_dir}/secure_boot.conf"
324-
)
325-
elseif(SB_CONFIG_NETCORE_EMPTY)
326-
add_overlay_config(
327-
${SB_CONFIG_NETCORE_EMPTY_NAME} # ToDo: Create a common Kconfig setting
328-
# which can then default to the exact
329-
# remote image selected, as to work for
330-
# hci, mpsl, thread, etc.
331-
"${secure_boot_image_dir}/secure_boot.conf"
332-
)
333-
elseif(SB_CONFIG_NETCORE_RPC_HOST)
334-
add_overlay_config(
335-
${SB_CONFIG_NETCORE_RPC_HOST_NAME} # ToDo: Create a common Kconfig setting
336-
# which can then default to the exact
337-
# remote image selected, as to work for
338-
# hci, mpsl, thread, etc.
339-
"${secure_boot_image_dir}/secure_boot.conf"
340-
)
341-
elseif(SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG)
342-
add_overlay_config(
343-
${SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG_NAME} # ToDo: Create a common Kconfig setting
344-
# which can then default to the exact
345-
# remote image selected, as to work for
346-
# hci, mpsl, thread, etc.
347-
"${secure_boot_image_dir}/secure_boot.conf"
348-
)
349-
endif()
308+
if(SB_CONFIG_SECURE_BOOT_NETCORE AND NOT SB_CONFIG_NETCORE_NONE)
309+
add_overlay_config(
310+
${SB_CONFIG_NETCORE_IMAGE_NAME}
311+
"${secure_boot_image_dir}/secure_boot.conf"
312+
)
350313

351314
add_overlay_config(mcuboot "${ZEPHYR_NRF_MODULE_DIR}/subsys/pcd/pcd.conf")
352315
endif()

‎sysbuild/Kconfig.netcore

+20-107
Original file line numberDiff line numberDiff line change
@@ -86,129 +86,40 @@ config NETCORE_MULTIPROTOCOL_RPMSG
8686

8787
endchoice
8888

89-
config NETCORE_EMPTY_NAME
90-
string
91-
default "empty_net_core"
92-
depends on NETCORE_EMPTY
93-
help
94-
Image name of empty image.
95-
96-
config NETCORE_EMPTY_BOARD
97-
string
98-
default "nrf5340dk_nrf5340_cpunet" if ($(BOARD) = "nrf5340dk_nrf5340_cpuapp" || $(BOARD) = "nrf5340dk_nrf5340_cpuapp_ns")
99-
default "thingy53_nrf5340_cpunet" if ($(BOARD) = "thingy53_nrf5340_cpuapp" || $(BOARD) = "thingy53_nrf5340_cpuapp_ns")
100-
default "nrf7002dk_nrf5340_cpunet" if ($(BOARD) = "nrf7002dk_nrf5340_cpuapp" || $(BOARD) = "nrf7002dk_nrf5340_cpuapp_ns")
101-
depends on NETCORE_EMPTY
102-
help
103-
Remote board when building this sample.
104-
If not set, the board given to sysbuild is used.
105-
106-
config NETCORE_EMPTY_DOMAIN
107-
string
108-
default "CPUNET" if (NETCORE_EMPTY_BOARD = "nrf5340dk_nrf5340_cpunet" || NETCORE_EMPTY_BOARD = "thingy53_nrf5340_cpunet" || NETCORE_EMPTY_BOARD = "nrf7002dk_nrf5340_cpunet")
109-
110-
config NETCORE_EMPTY_DOMAIN_APP
111-
bool
112-
default y if (NETCORE_EMPTY_BOARD = "nrf5340dk_nrf5340_cpunet" || NETCORE_EMPTY_BOARD = "thingy53_nrf5340_cpunet" || NETCORE_EMPTY_BOARD = "nrf7002dk_nrf5340_cpunet")
113-
114-
config NETCORE_HCI_RPMSG_NAME
115-
string
116-
default "hci_rpmsg"
117-
depends on NETCORE_HCI_RPMSG
118-
help
119-
Image name of radio hci rpmsg.
120-
121-
config NETCORE_HCI_RPMSG_BOARD
122-
string
123-
default "nrf5340dk_nrf5340_cpunet" if ($(BOARD) = "nrf5340dk_nrf5340_cpuapp" || $(BOARD) = "nrf5340dk_nrf5340_cpuapp_ns")
124-
default "thingy53_nrf5340_cpunet" if ($(BOARD) = "thingy53_nrf5340_cpuapp" || $(BOARD) = "thingy53_nrf5340_cpuapp_ns")
125-
default "nrf7002dk_nrf5340_cpunet" if ($(BOARD) = "nrf7002dk_nrf5340_cpuapp" || $(BOARD) = "nrf7002dk_nrf5340_cpuapp_ns")
126-
depends on NETCORE_HCI_RPMSG
127-
help
128-
Remote board when building this sample.
129-
If not set, the board given to sysbuild is used.
130-
131-
config NETCORE_HCI_RPMSG_DOMAIN
132-
string
133-
default "CPUNET" if (NETCORE_HCI_RPMSG_BOARD = "nrf5340dk_nrf5340_cpunet" || NETCORE_HCI_RPMSG_BOARD = "thingy53_nrf5340_cpunet" || NETCORE_HCI_RPMSG_BOARD = "nrf7002dk_nrf5340_cpunet")
134-
135-
config NETCORE_HCI_RPMSG_DOMAIN_APP
136-
bool
137-
default y if (NETCORE_HCI_RPMSG_BOARD = "nrf5340dk_nrf5340_cpunet" || NETCORE_HCI_RPMSG_BOARD = "thingy53_nrf5340_cpunet" || NETCORE_HCI_RPMSG_BOARD = "nrf7002dk_nrf5340_cpunet")
89+
if !NETCORE_NONE
13890

139-
config NETCORE_RPC_HOST_NAME
91+
config NETCORE_IMAGE_NAME
14092
string
141-
default "rpc_host"
142-
depends on NETCORE_RPC_HOST
93+
default "empty_net_core" if NETCORE_EMPTY
94+
default "hci_rpmsg" if NETCORE_HCI_RPMSG
95+
default "rpc_host" if NETCORE_RPC_HOST
96+
default "802154_rpmsg" if NETCORE_802154_RPMSG
97+
default "multiprotocol_rpmsg" if NETCORE_MULTIPROTOCOL_RPMSG
14398
help
144-
Image name of radio rpc host.
99+
Name of netcore image.
145100

146-
config NETCORE_RPC_HOST_BOARD
101+
config NETCORE_IMAGE_PATH
147102
string
148-
default "nrf5340dk_nrf5340_cpunet" if ($(BOARD) = "nrf5340dk_nrf5340_cpuapp" || $(BOARD) = "nrf5340dk_nrf5340_cpuapp_ns")
149-
default "thingy53_nrf5340_cpunet" if ($(BOARD) = "thingy53_nrf5340_cpuapp" || $(BOARD) = "thingy53_nrf5340_cpuapp_ns")
150-
depends on NETCORE_RPC_HOST
103+
default "${ZEPHYR_NRF_MODULE_DIR}/samples/nrf5340/empty_net_core" if NETCORE_EMPTY
104+
default "${ZEPHYR_BASE}/samples/bluetooth/hci_rpmsg" if NETCORE_HCI_RPMSG
105+
default "${ZEPHYR_NRF_MODULE_DIR}/samples/bluetooth/rpc_host" if NETCORE_RPC_HOST
106+
default "${ZEPHYR_BASE}/samples/boards/nrf/ieee802154/802154_rpmsg" if NETCORE_802154_RPMSG
107+
default "${ZEPHYR_NRF_MODULE_DIR}/samples/nrf5340/multiprotocol_rpmsg" if NETCORE_MULTIPROTOCOL_RPMSG
151108
help
152-
Remote board when building this sample.
153-
If not set, the board given to sysbuild is used.
154-
155-
config NETCORE_RPC_HOST_DOMAIN
156-
string
157-
default "CPUNET" if (NETCORE_RPC_HOST_BOARD = "nrf5340dk_nrf5340_cpunet" || NETCORE_RPC_HOST_BOARD = "thingy53_nrf5340_cpunet")
158-
159-
config NETCORE_RPC_HOST_DOMAIN_APP
160-
bool
161-
default y if (NETCORE_RPC_HOST_BOARD = "nrf5340dk_nrf5340_cpunet" || NETCORE_RPC_HOST_BOARD = "thingy53_nrf5340_cpunet")
109+
Source directory of netcore image.
162110

163-
config NETCORE_802154_RPMSG_NAME
164-
string
165-
default "802154_rpmsg"
166-
depends on NETCORE_802154_RPMSG
167-
help
168-
Image name of radio 802154 rpmsg.
169-
170-
config NETCORE_802154_RPMSG_BOARD
111+
config NETCORE_IMAGE_BOARD
171112
string
172113
default "nrf5340dk_nrf5340_cpunet" if ($(BOARD) = "nrf5340dk_nrf5340_cpuapp" || $(BOARD) = "nrf5340dk_nrf5340_cpuapp_ns")
173114
default "thingy53_nrf5340_cpunet" if ($(BOARD) = "thingy53_nrf5340_cpuapp" || $(BOARD) = "thingy53_nrf5340_cpuapp_ns")
174115
default "nrf7002dk_nrf5340_cpunet" if ($(BOARD) = "nrf7002dk_nrf5340_cpuapp" || $(BOARD) = "nrf7002dk_nrf5340_cpuapp_ns")
175-
depends on NETCORE_802154_RPMSG
176116
help
177117
Remote board when building this sample.
178118
If not set, the board given to sysbuild is used.
179119

180-
config NETCORE_802154_RPMSG_DOMAIN
120+
config NETCORE_IMAGE_DOMAIN
181121
string
182-
default "CPUNET" if (NETCORE_802154_RPMSG_BOARD = "nrf5340dk_nrf5340_cpunet" || NETCORE_802154_RPMSG_BOARD = "thingy53_nrf5340_cpunet" || NETCORE_802154_RPMSG_BOARD = "nrf7002dk_nrf5340_cpunet")
183-
184-
config NETCORE_802154_RPMSG_DOMAIN_APP
185-
bool
186-
default y if (NETCORE_802154_RPMSG_BOARD = "nrf5340dk_nrf5340_cpunet" || NETCORE_802154_RPMSG_BOARD = "thingy53_nrf5340_cpunet" || NETCORE_802154_RPMSG_BOARD = "nrf7002dk_nrf5340_cpunet")
187-
188-
config NETCORE_MULTIPROTOCOL_RPMSG_NAME
189-
string
190-
default "multiprotocol_rpmsg"
191-
depends on NETCORE_MULTIPROTOCOL_RPMSG
192-
help
193-
Image name of radio hci rpmsg.
194-
195-
config NETCORE_MULTIPROTOCOL_RPMSG_BOARD
196-
string
197-
default "nrf5340dk_nrf5340_cpunet" if ($(BOARD) = "nrf5340dk_nrf5340_cpuapp" || $(BOARD) = "nrf5340dk_nrf5340_cpuapp_ns")
198-
default "thingy53_nrf5340_cpunet" if ($(BOARD) = "thingy53_nrf5340_cpuapp" || $(BOARD) = "thingy53_nrf5340_cpuapp_ns")
199-
default "nrf7002dk_nrf5340_cpunet" if ($(BOARD) = "nrf7002dk_nrf5340_cpuapp" || $(BOARD) = "nrf7002dk_nrf5340_cpuapp_ns")
200-
depends on NETCORE_MULTIPROTOCOL_RPMSG
201-
help
202-
Remote board when building this sample.
203-
If not set, the board given to sysbuild is used.
204-
205-
config NETCORE_MULTIPROTOCOL_RPMSG_DOMAIN
206-
string
207-
default "CPUNET" if (NETCORE_MULTIPROTOCOL_RPMSG_BOARD = "nrf5340dk_nrf5340_cpunet" || NETCORE_MULTIPROTOCOL_RPMSG_BOARD = "thingy53_nrf5340_cpunet" || NETCORE_MULTIPROTOCOL_RPMSG_BOARD = "nrf7002dk_nrf5340_cpunet")
208-
209-
config NETCORE_MULTIPROTOCOL_RPMSG_DOMAIN_APP
210-
bool
211-
default y if (NETCORE_MULTIPROTOCOL_RPMSG_BOARD = "nrf5340dk_nrf5340_cpunet" || NETCORE_MULTIPROTOCOL_RPMSG_BOARD = "thingy53_nrf5340_cpunet" || NETCORE_MULTIPROTOCOL_RPMSG_BOARD = "nrf7002dk_nrf5340_cpunet")
122+
default "CPUNET" if (NETCORE_IMAGE_BOARD = "nrf5340dk_nrf5340_cpunet" || NETCORE_IMAGE_BOARD = "thingy53_nrf5340_cpunet" || NETCORE_IMAGE_BOARD = "nrf7002dk_nrf5340_cpunet")
212123

213124
config NETCORE_APP_UPDATE
214125
bool "Network core updates"
@@ -218,4 +129,6 @@ config NETCORE_APP_UPDATE
218129
Enabling this will add support for network core updates from the application core,
219130
requires b0n for network core and MCUboot for application core.
220131

132+
endif
133+
221134
endmenu

‎sysbuild/netcore.cmake

+13-116
Original file line numberDiff line numberDiff line change
@@ -3,134 +3,31 @@
33
#
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55

6-
# Include hci_rpmsg if enabled.
76
get_property(PM_DOMAINS GLOBAL PROPERTY PM_DOMAINS)
8-
if(SB_CONFIG_NETCORE_HCI_RPMSG)
9-
ExternalZephyrProject_Add(
10-
APPLICATION ${SB_CONFIG_NETCORE_HCI_RPMSG_NAME}
11-
SOURCE_DIR ${ZEPHYR_BASE}/samples/bluetooth/hci_rpmsg
12-
BOARD ${SB_CONFIG_NETCORE_HCI_RPMSG_BOARD}
13-
)
14-
15-
if(NOT "${SB_CONFIG_NETCORE_HCI_RPMSG_DOMAIN}" IN_LIST PM_DOMAINS)
16-
list(APPEND PM_DOMAINS ${SB_CONFIG_NETCORE_HCI_RPMSG_DOMAIN})
17-
endif()
18-
set_property(GLOBAL APPEND PROPERTY
19-
PM_${SB_CONFIG_NETCORE_HCI_RPMSG_DOMAIN}_IMAGES
20-
"${SB_CONFIG_NETCORE_HCI_RPMSG_NAME}"
21-
)
227

23-
if(SB_CONFIG_NETCORE_HCI_RPMSG_DOMAIN_APP)
24-
set_property(GLOBAL PROPERTY DOMAIN_APP_${SB_CONFIG_NETCORE_HCI_RPMSG_DOMAIN}
25-
"${SB_CONFIG_NETCORE_HCI_RPMSG_NAME}"
26-
)
27-
endif()
28-
set(${SB_CONFIG_NETCORE_HCI_RPMSG_DOMAIN}_PM_DOMAIN_DYNAMIC_PARTITION
29-
${SB_CONFIG_NETCORE_HCI_RPMSG_NAME} CACHE INTERNAL ""
30-
)
31-
endif()
32-
33-
# Include rpc_host if enabled.
34-
if(SB_CONFIG_NETCORE_RPC_HOST)
8+
# Include network core image if enabled
9+
if(SB_CONFIG_SUPPORT_NETCORE AND NOT SB_CONFIG_NETCORE_NONE AND DEFINED SB_CONFIG_NETCORE_IMAGE_NAME)
3510
ExternalZephyrProject_Add(
36-
APPLICATION ${SB_CONFIG_NETCORE_RPC_HOST_NAME}
37-
SOURCE_DIR ${ZEPHYR_NRF_MODULE_DIR}/samples/bluetooth/rpc_host
38-
BOARD ${SB_CONFIG_NETCORE_RPC_HOST_BOARD}
11+
APPLICATION ${SB_CONFIG_NETCORE_IMAGE_NAME}
12+
SOURCE_DIR ${SB_CONFIG_NETCORE_IMAGE_PATH}
13+
BOARD ${SB_CONFIG_NETCORE_IMAGE_BOARD}
3914
)
4015

41-
if(NOT "${SB_CONFIG_NETCORE_RPC_HOST_DOMAIN}" IN_LIST PM_DOMAINS)
42-
list(APPEND PM_DOMAINS ${SB_CONFIG_NETCORE_RPC_HOST_DOMAIN})
16+
if(NOT "${SB_CONFIG_NETCORE_IMAGE_DOMAIN}" IN_LIST PM_DOMAINS)
17+
list(APPEND PM_DOMAINS ${SB_CONFIG_NETCORE_IMAGE_DOMAIN})
4318
endif()
44-
set_property(GLOBAL APPEND PROPERTY
45-
PM_${SB_CONFIG_NETCORE_RPC_HOST_DOMAIN}_IMAGES
46-
"${SB_CONFIG_NETCORE_RPC_HOST_NAME}"
47-
)
48-
49-
if(SB_CONFIG_NETCORE_RPC_HOST_DOMAIN_APP)
50-
set_property(GLOBAL PROPERTY DOMAIN_APP_${SB_CONFIG_NETCORE_RPC_HOST_DOMAIN}
51-
"${SB_CONFIG_NETCORE_RPC_HOST_NAME}"
52-
)
53-
endif()
54-
set(${SB_CONFIG_NETCORE_RPC_HOST_DOMAIN}_PM_DOMAIN_DYNAMIC_PARTITION
55-
${SB_CONFIG_NETCORE_RPC_HOST_NAME} CACHE INTERNAL ""
56-
)
57-
endif()
5819

59-
# Include 802154_rpmsg if enabled.
60-
if(SB_CONFIG_NETCORE_802154_RPMSG)
61-
ExternalZephyrProject_Add(
62-
APPLICATION ${SB_CONFIG_NETCORE_802154_RPMSG_NAME}
63-
SOURCE_DIR ${ZEPHYR_BASE}/samples/boards/nrf/ieee802154/802154_rpmsg
64-
BOARD ${SB_CONFIG_NETCORE_802154_RPMSG_BOARD}
65-
)
66-
67-
if(NOT "${SB_CONFIG_NETCORE_802154_RPMSG_DOMAIN}" IN_LIST PM_DOMAINS)
68-
list(APPEND PM_DOMAINS ${SB_CONFIG_NETCORE_802154_RPMSG_DOMAIN})
69-
endif()
7020
set_property(GLOBAL APPEND PROPERTY
71-
PM_${SB_CONFIG_NETCORE_802154_RPMSG_DOMAIN}_IMAGES
72-
"${SB_CONFIG_NETCORE_802154_RPMSG_NAME}"
21+
PM_${SB_CONFIG_NETCORE_IMAGE_DOMAIN}_IMAGES
22+
"${SB_CONFIG_NETCORE_IMAGE_NAME}"
7323
)
7424

75-
if(SB_CONFIG_NETCORE_802154_RPMSG_DOMAIN_APP)
76-
set_property(GLOBAL PROPERTY DOMAIN_APP_${SB_CONFIG_NETCORE_802154_RPMSG_DOMAIN}
77-
"${SB_CONFIG_NETCORE_802154_RPMSG_NAME}"
78-
)
79-
endif()
80-
set(${SB_CONFIG_NETCORE_802154_RPMSG_DOMAIN}_PM_DOMAIN_DYNAMIC_PARTITION
81-
${SB_CONFIG_NETCORE_802154_RPMSG_NAME} CACHE INTERNAL ""
82-
)
83-
endif()
84-
85-
# Include multiprotocol_rpmsg if enabled.
86-
if(SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG)
87-
ExternalZephyrProject_Add(
88-
APPLICATION ${SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG_NAME}
89-
SOURCE_DIR ${ZEPHYR_NRF_MODULE_DIR}/samples/nrf5340/multiprotocol_rpmsg
90-
BOARD ${SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG_BOARD}
91-
)
92-
93-
if(NOT "${SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG_DOMAIN}" IN_LIST PM_DOMAINS)
94-
list(APPEND PM_DOMAINS ${SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG_DOMAIN})
95-
endif()
96-
set_property(GLOBAL APPEND PROPERTY
97-
PM_${SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG_DOMAIN}_IMAGES
98-
"${SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG_NAME}"
99-
)
100-
101-
if(SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG_DOMAIN_APP)
102-
set_property(GLOBAL PROPERTY DOMAIN_APP_${SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG_DOMAIN}
103-
"${SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG_NAME}"
104-
)
105-
endif()
106-
set(${SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG_DOMAIN}_PM_DOMAIN_DYNAMIC_PARTITION
107-
${SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG_NAME} CACHE INTERNAL ""
108-
)
109-
endif()
110-
111-
# Include empty_net_core if enabled.
112-
if(SB_CONFIG_NETCORE_EMPTY)
113-
ExternalZephyrProject_Add(
114-
APPLICATION ${SB_CONFIG_NETCORE_EMPTY_NAME}
115-
SOURCE_DIR ${ZEPHYR_NRF_MODULE_DIR}/samples/nrf5340/empty_net_core
116-
BOARD ${SB_CONFIG_NETCORE_EMPTY_BOARD}
25+
set_property(GLOBAL PROPERTY DOMAIN_APP_${SB_CONFIG_NETCORE_IMAGE_DOMAIN}
26+
"${SB_CONFIG_NETCORE_IMAGE_NAME}"
11727
)
11828

119-
if(NOT "${SB_CONFIG_NETCORE_EMPTY_DOMAIN}" IN_LIST PM_DOMAINS)
120-
list(APPEND PM_DOMAINS ${SB_CONFIG_NETCORE_EMPTY_DOMAIN})
121-
endif()
122-
set_property(GLOBAL APPEND PROPERTY
123-
PM_${SB_CONFIG_NETCORE_EMPTY_DOMAIN}_IMAGES
124-
"${SB_CONFIG_NETCORE_EMPTY_NAME}"
125-
)
126-
127-
if(SB_CONFIG_NETCORE_EMPTY_DOMAIN_APP)
128-
set_property(GLOBAL PROPERTY DOMAIN_APP_${SB_CONFIG_NETCORE_EMPTY_DOMAIN}
129-
"${SB_CONFIG_NETCORE_EMPTY_NAME}"
130-
)
131-
endif()
132-
set(${SB_CONFIG_NETCORE_EMPTY_DOMAIN}_PM_DOMAIN_DYNAMIC_PARTITION
133-
${SB_CONFIG_NETCORE_EMPTY_NAME} CACHE INTERNAL ""
29+
set(${SB_CONFIG_NETCORE_IMAGE_DOMAIN}_PM_DOMAIN_DYNAMIC_PARTITION
30+
${SB_CONFIG_NETCORE_IMAGE_NAME} CACHE INTERNAL ""
13431
)
13532
endif()
13633

0 commit comments

Comments
 (0)