Misc. ironside work september 3.

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()

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

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

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.

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"

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