Skip to content

Remove child/parent image support #2343

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

Merged
merged 4 commits into from
Jan 20, 2025
Merged

Remove child/parent image support #2343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a18958
Revert "[nrf noup] cmake: modules: kconfig: Add hide child/parent var…
nordicjm Dec 5, 2024
c768aa5
[nrf fromlist] boards: nordic: nrf5340dk/nrf9160dk: Use sysbuild for …
nordicjm Dec 11, 2024
ecef809
[nrf noup] samples/tests: Add TF-M sysbuild config files
nordicjm Dec 12, 2024
f3fa540
[nrf noup] cmake: linker: ld: target: Remove child/parent image flag
nordicjm Dec 12, 2024
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
1 change: 1 addition & 0 deletions boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ supported:
- gpio
- spi
vendor: nordic
sysbuild: true
1 change: 1 addition & 0 deletions boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ supported:
- netif:modem
- gpio
vendor: nordic
sysbuild: true
1 change: 1 addition & 0 deletions boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ supported:
- netif:modem
- gpio
vendor: nordic
sysbuild: true
2 changes: 1 addition & 1 deletion cmake/linker/ld/target.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
${current_includes}
${soc_linker_script_includes}
${template_script_defines}
-DUSE_PARTITION_MANAGER=$<OR:$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>,$<BOOL:${IMAGE_NAME}>,$<TARGET_EXISTS:partition_manager>>
-DUSE_PARTITION_MANAGER=$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>
-E ${LINKER_SCRIPT}
-P # Prevent generation of debug `#line' directives.
-o ${linker_script_gen}
Expand Down
1 change: 0 additions & 1 deletion cmake/modules/kconfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ set(COMMON_KCONFIG_ENV_SETTINGS
TOOLCHAIN_KCONFIG_DIR=${TOOLCHAIN_KCONFIG_DIR}
TOOLCHAIN_HAS_NEWLIB=${_local_TOOLCHAIN_HAS_NEWLIB}
TOOLCHAIN_HAS_PICOLIBC=${_local_TOOLCHAIN_HAS_PICOLIBC}
HIDE_CHILD_PARENT_CONFIG=${SYSBUILD}
EDT_PICKLE=${EDT_PICKLE}
# Export all Zephyr modules to Kconfig
${ZEPHYR_KCONFIG_MODULES_DIR}
Expand Down
1 change: 1 addition & 0 deletions samples/subsys/usb/dfu/sysbuild.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SB_CONFIG_BOOTLOADER_MCUBOOT=y
1 change: 0 additions & 1 deletion tests/drivers/flash/common/sysbuild.conf
View file
Open in desktop

This file was deleted.

Loading