From 7f5c86a111bd0028676499142b5ab65d3c374a5c Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Thu, 5 Dec 2024 10:22:38 +0000 Subject: [PATCH 1/4] Revert "[nrf noup] cmake: modules: kconfig: Add hide child/parent variable" fixup! [nrf noup] cmake: modules: kconfig: Add hide child/parent variable This reverts commit 2483870f79a3f4c4da2ff11f61d7a9d9d40afa2c. Signed-off-by: Jamie McCrae --- cmake/modules/kconfig.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/modules/kconfig.cmake b/cmake/modules/kconfig.cmake index 97086cdf19d..02bebbe0851 100644 --- a/cmake/modules/kconfig.cmake +++ b/cmake/modules/kconfig.cmake @@ -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} From d5ec91d4e6c1a97f7dc54380ed17e7326239da1f Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Wed, 11 Dec 2024 13:39:46 +0000 Subject: [PATCH 2/4] [nrf fromlist] boards: nordic: nrf5340dk/nrf9160dk: Use sysbuild for ns twister Enables forcing use of sysbuild to build nrf5340dk/nrf9160dk non-secure board targets when using twister Upstream PR #: 82907 Signed-off-by: Jamie McCrae --- boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml | 1 + boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml | 1 + boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml index 4c366d2f363..cec7b107776 100644 --- a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml +++ b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml @@ -18,3 +18,4 @@ supported: - gpio - spi vendor: nordic +sysbuild: true diff --git a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml index d610095afaf..86161bb4385 100644 --- a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml +++ b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_14_0.yaml @@ -19,3 +19,4 @@ supported: - netif:modem - gpio vendor: nordic +sysbuild: true diff --git a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml index 0faa84b38c9..52b8f85efb4 100644 --- a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml +++ b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_ns_0_7_0.yaml @@ -19,3 +19,4 @@ supported: - netif:modem - gpio vendor: nordic +sysbuild: true From ff95eb6f3854eebe302655b18c61c403ee0edc4e Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Thu, 12 Dec 2024 07:58:06 +0000 Subject: [PATCH 3/4] [nrf noup] samples/tests: Add TF-M sysbuild config files Fixes some issues with samples/tests by adding configuration files to satisfy TF-M requirements Signed-off-by: Jamie McCrae --- samples/subsys/usb/dfu/sysbuild.conf | 1 + tests/drivers/flash/common/sysbuild.conf | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 samples/subsys/usb/dfu/sysbuild.conf delete mode 100644 tests/drivers/flash/common/sysbuild.conf diff --git a/samples/subsys/usb/dfu/sysbuild.conf b/samples/subsys/usb/dfu/sysbuild.conf new file mode 100644 index 00000000000..47f00ff3cff --- /dev/null +++ b/samples/subsys/usb/dfu/sysbuild.conf @@ -0,0 +1 @@ +SB_CONFIG_BOOTLOADER_MCUBOOT=y diff --git a/tests/drivers/flash/common/sysbuild.conf b/tests/drivers/flash/common/sysbuild.conf deleted file mode 100644 index 6408669a847..00000000000 --- a/tests/drivers/flash/common/sysbuild.conf +++ /dev/null @@ -1 +0,0 @@ -SB_CONFIG_PARTITION_MANAGER=n From cd136d0bbb232d77d8ef693b366609635df8d83d Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Thu, 12 Dec 2024 08:05:53 +0000 Subject: [PATCH 4/4] [nrf noup] cmake: linker: ld: target: Remove child/parent image flag fixup! [nrf noup] tree-wide: support NCS Partition Manager (PM) definitions Removes a condition in the partition manager enabled check which was for child/parent images and keeps the sysbuild one only Signed-off-by: Jamie McCrae --- cmake/linker/ld/target.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/linker/ld/target.cmake b/cmake/linker/ld/target.cmake index c941d8ee89e..d7ac5e41d89 100644 --- a/cmake/linker/ld/target.cmake +++ b/cmake/linker/ld/target.cmake @@ -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=$,$,$> + -DUSE_PARTITION_MANAGER=$ -E ${LINKER_SCRIPT} -P # Prevent generation of debug `#line' directives. -o ${linker_script_gen}