Revert "[nrf noup] dts: nordic: Add support for BICR generation"

This reverts commit 30b5300.

Signed-off-by: Grzegorz Swiderski <[email protected]>

Author: 57300

boards/nordic/nrf54h20dk/nrf54h20dk_bicr.dtsi

@@ -8,7 +8,6 @@
 
 #include <nordic/nrf54h20_cpuapp.dtsi>
 #include "nrf54h20dk_nrf54h20-common.dtsi"
-#include "nrf54h20dk_bicr.dtsi"
 
 /delete-node/ &cpurad_cpusys_ipc;
 /delete-node/ &cpusec_cpurad_ipc;

boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts

@@ -5,7 +5,7 @@ description: NRF5 GPIO node
 
 compatible: "nordic,nrf-gpio"
 
-include: [gpio-controller.yaml, base.yaml, "nordic,nrf-port-configs.yaml"]
+include: [gpio-controller.yaml, base.yaml]
 
 properties:
   reg:

dts/bindings/gpio/nordic,nrf-gpio.yaml

@@ -11,9 +11,6 @@ add_subdirectory_ifdef(CONFIG_HAS_NRFS nrfs)
 if(CONFIG_NRF_REGTOOL_GENERATE_UICR)
   list(APPEND nrf_regtool_components GENERATE:UICR)
 endif()
-if(CONFIG_NRF_REGTOOL_GENERATE_BICR)
-  list(APPEND nrf_regtool_components GENERATE:BICR)
-endif()
 if(DEFINED nrf_regtool_components)
   find_package(nrf-regtool 5.6.0 REQUIRED
     COMPONENTS ${nrf_regtool_components}

dts/bindings/gpio/nordic,nrf-port-configs.yaml

@@ -11,13 +11,6 @@ config NRF_REGTOOL_GENERATE_UICR
 	  CPU domains that require UICR allocation aren't bootable without it
 	  being programmed alongside the firmware.
 
-config NRF_REGTOOL_GENERATE_BICR
-	bool "Generate BICR"
-	help
-	  Generate a BICR hex based on devicetree contents using nrf-regtool.
-	  If not already present, the BICR must be included alongside
-	  any firmware programmed to the board for the first time.
-
 config NRF_REGTOOL_VERBOSITY
 	int "Verbosity level of console output"
 	range 0 3

dts/bindings/misc/nordic,nrf-bicr.yaml

@@ -26,10 +26,6 @@ function(nrf_regtool_generate_hex_from_dts peripheral)
   )
   message(STATUS "Generated ${peripheral} hex file: ${generated_hex_file}")
 
-  if(NOT peripheral STREQUAL "UICR")
-    return()
-  endif()
-
   set(merged_hex_file ${PROJECT_BINARY_DIR}/${merged_hex_name})
   set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
     COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/mergehex.py

modules/hal_nordic/CMakeLists.txt

@@ -11,7 +11,4 @@ config NUM_IRQS
 config NRF_REGTOOL_GENERATE_UICR
 	default y
 
-config NRF_REGTOOL_GENERATE_BICR
-	default y
-
 endif # SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP