Skip to content

Commit 185d700

Browse files
jonathannilsencarlescufi
authored andcommitted
sysbuild: remove PERIPHCONF generation via nrf-regtool uicr-migrate
PERIPHCONF generation based on devicetree is being added in a script in upstream zephyr. The new script script replaces nrf-regtool and the temporary "periphconf migration" solution. Ref: NCSDK-35206 Signed-off-by: Jonathan Nilsen <[email protected]>
1 parent 4e90bed commit 185d700

File tree

5 files changed

+0
-88
lines changed

5 files changed

+0
-88
lines changed

CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,3 @@ add_subdirectory(subsys)
3535
add_subdirectory(modules)
3636
add_subdirectory(drivers)
3737
add_subdirectory(tests)
38-
39-
# TEMPHACK: Add a source file generated by cmake/sysbuild/periphconf_migrate.cmake
40-
if(SYSBUILD AND CONFIG_NRF_HALTIUM_GENERATE_UICR)
41-
file(TOUCH ${APPLICATION_BINARY_DIR}/../periphconf_migrated.c)
42-
zephyr_sources(${APPLICATION_BINARY_DIR}/../periphconf_migrated.c)
43-
endif()

cmake/sysbuild/periphconf_migrate.cmake

Lines changed: 0 additions & 66 deletions
This file was deleted.

sysbuild/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -859,10 +859,6 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake)
859859
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${BINARY_DIR}/zephyr/.config)
860860
endif()
861861
endif()
862-
863-
if(SB_CONFIG_NRF_PERIPHCONF_MIGRATE)
864-
include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/periphconf_migrate.cmake)
865-
endif()
866862
endfunction(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake)
867863

868864
# Enable use of partition manager with sysbuild.

sysbuild/Kconfig.periphconf

Lines changed: 0 additions & 11 deletions
This file was deleted.

sysbuild/Kconfig.sysbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,4 @@ rsource "Kconfig.approtect"
8484
rsource "Kconfig.lwm2m_carrier"
8585
rsource "Kconfig.cracen"
8686
rsource "Kconfig.tfm"
87-
rsource "Kconfig.periphconf"
8887
rsource "Kconfig.firmware_loader"

0 commit comments

Comments
 (0)