diff --git a/CMakeLists.txt b/CMakeLists.txt index a656e53089d7..aa5535e553a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,9 +35,3 @@ add_subdirectory(subsys) add_subdirectory(modules) add_subdirectory(drivers) add_subdirectory(tests) - -# TEMPHACK: Add a source file generated by cmake/sysbuild/periphconf_migrate.cmake -if(SYSBUILD AND CONFIG_NRF_HALTIUM_GENERATE_UICR) - file(TOUCH ${APPLICATION_BINARY_DIR}/../periphconf_migrated.c) - zephyr_sources(${APPLICATION_BINARY_DIR}/../periphconf_migrated.c) -endif() diff --git a/cmake/sysbuild/periphconf_migrate.cmake b/cmake/sysbuild/periphconf_migrate.cmake deleted file mode 100644 index e1b43ddbe957..000000000000 --- a/cmake/sysbuild/periphconf_migrate.cmake +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright (c) 2025 Nordic Semiconductor ASA -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -# This file includes extra sysbuild POST_CMAKE logic to assist with -# autogenerating an IronSide SE compatible UICR. -# -# It is enabled when SB_CONFIG_NRF_PERIPHCONF_MIGRATE=y is set and -# one of the sysbuild images has CONFIG_NRF_HALTIUM_GENERATE_UICR=y. -# It uses nrf-regtool to produce an extra source file for that image -# (periphconf_migrated.c) based on multiple image devicetrees. -# -# NOTE: This is a temporary solution for NCS. The planned solution -# for upstream Zephyr will not require nrf-regtool. - -set(ironside_uicr_images "") -set(ironside_uicr_main_image) -foreach(image ${POST_CMAKE_IMAGES}) - sysbuild_get(${image}_54h20_app IMAGE ${image} VAR CONFIG_SOC_NRF54H20_CPUAPP KCONFIG) - sysbuild_get(${image}_54h20_rad IMAGE ${image} VAR CONFIG_SOC_NRF54H20_CPURAD KCONFIG) - if(${image}_54h20_app OR ${image}_54h20_rad) - list(APPEND ironside_uicr_images ${image}) - if(NOT DEFINED ironside_uicr_main_image) - sysbuild_get(image_generates_uicr IMAGE ${image} VAR CONFIG_NRF_HALTIUM_GENERATE_UICR KCONFIG) - if(image_generates_uicr) - set(ironside_uicr_main_image ${image}) - endif() - endif() - endif() -endforeach() -if(DEFINED ironside_uicr_main_image) - find_program(NRF_REGTOOL nrf-regtool REQUIRED) - set(nrf_regtool_cmd - COMMAND - ${CMAKE_COMMAND} -E env PYTHONPATH=${ZEPHYR_BASE}/scripts/dts/python-devicetree/src - ${NRF_REGTOOL} - ) - ExternalProject_Get_Property(${ironside_uicr_main_image} BINARY_DIR) - set(nrf_regtool_migrate_cmd - ${nrf_regtool_cmd} - uicr-migrate - --edt-pickle-file ${BINARY_DIR}/zephyr/edt.pickle - --output-periphconf-file ${APPLICATION_BINARY_DIR}/periphconf_migrated.c - ) - foreach(image ${ironside_uicr_images}) - ExternalProject_Get_Property(${image} BINARY_DIR) - sysbuild_get(image_soc IMAGE ${image} VAR CONFIG_SOC KCONFIG) - set(image_uicr_hex ${PROJECT_BINARY_DIR}/uicr_${image}.hex) - message(STATUS "Running nrf-regtool uicr-compile for ${image}") - execute_process( - ${nrf_regtool_cmd} - uicr-compile - --edt-pickle-file ${BINARY_DIR}/zephyr/edt.pickle - --product-name ${image_soc} - --output-file ${image_uicr_hex} - WORKING_DIRECTORY ${APPLICATION_SOURCE_DIR} - COMMAND_ERROR_IS_FATAL ANY - ) - list(APPEND nrf_regtool_migrate_cmd --uicr-hex-file ${image_uicr_hex}) - endforeach() - message(STATUS "Running nrf-regtool uicr-migrate for ${ironside_uicr_main_image}") - execute_process( - ${nrf_regtool_migrate_cmd} - WORKING_DIRECTORY ${APPLICATION_SOURCE_DIR} - COMMAND_ERROR_IS_FATAL ANY - ) -endif() diff --git a/samples/pmic/native/npm13xx_fuel_gauge/sample.yaml b/samples/pmic/native/npm13xx_fuel_gauge/sample.yaml index c162acf8b5a6..f65e59432412 100644 --- a/samples/pmic/native/npm13xx_fuel_gauge/sample.yaml +++ b/samples/pmic/native/npm13xx_fuel_gauge/sample.yaml @@ -30,11 +30,11 @@ tests: sysbuild: true build_only: true extra_args: - - SHIELD=npm1300_ek + - npm13xx_fuel_gauge_SHIELD=npm1300_ek - EXTRA_DTC_OVERLAY_FILE=npm1300.overlay sample.npm1304_fuel_gauge_compile: sysbuild: true build_only: true extra_args: - - SHIELD=npm1304_ek + - npm13xx_fuel_gauge_SHIELD=npm1304_ek - EXTRA_DTC_OVERLAY_FILE=npm1304.overlay diff --git a/samples/pmic/native/npm13xx_one_button/sample.yaml b/samples/pmic/native/npm13xx_one_button/sample.yaml index 31d8893df7ef..b23f85c3ef8d 100644 --- a/samples/pmic/native/npm13xx_one_button/sample.yaml +++ b/samples/pmic/native/npm13xx_one_button/sample.yaml @@ -30,11 +30,11 @@ tests: sysbuild: true build_only: true extra_args: - - SHIELD=npm1300_ek + - npm13xx_one_button_SHIELD=npm1300_ek - EXTRA_DTC_OVERLAY_FILE=npm1300.overlay sample.npm1304_one_button_compile: sysbuild: true build_only: true extra_args: - - SHIELD=npm1304_ek + - npm13xx_one_button_SHIELD=npm1304_ek - EXTRA_DTC_OVERLAY_FILE=npm1304.overlay diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index 0611e69d7b39..a1a9a10c8e35 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -859,10 +859,6 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${BINARY_DIR}/zephyr/.config) endif() endif() - - if(SB_CONFIG_NRF_PERIPHCONF_MIGRATE) - include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/periphconf_migrate.cmake) - endif() endfunction(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) # Enable use of partition manager with sysbuild. diff --git a/sysbuild/Kconfig.periphconf b/sysbuild/Kconfig.periphconf deleted file mode 100644 index 812165863d1b..000000000000 --- a/sysbuild/Kconfig.periphconf +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) 2025 Nordic Semiconductor -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -config NRF_PERIPHCONF_MIGRATE - bool "Generate periphconf_migrated.c" - default y - depends on SOC_SERIES_NRF54HX - help - Enable autogenerating UICR.PERIPHCONF tables for multi-image builds, - to migrate an existing project for running with IronSide SE. - You can disable this if you have your own UICR.PERIPHCONF file. diff --git a/sysbuild/Kconfig.sysbuild b/sysbuild/Kconfig.sysbuild index beb33dd01f5b..2722cae69e05 100644 --- a/sysbuild/Kconfig.sysbuild +++ b/sysbuild/Kconfig.sysbuild @@ -84,5 +84,4 @@ rsource "Kconfig.approtect" rsource "Kconfig.lwm2m_carrier" rsource "Kconfig.cracen" rsource "Kconfig.tfm" -rsource "Kconfig.periphconf" rsource "Kconfig.firmware_loader" diff --git a/west.yml b/west.yml index 2bbedd9096e4..b30e3089718b 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: d32b79417c5a4c70f16cbbb579d3610daab5f88f + revision: pull/3276/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above