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

gmarull · gmarull · commit c460fdae6d3a · 2024-11-25T09:27:30.000+01:00
This reverts commit 1b6cc13. Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_bicr.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_bicr.dtsi
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -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;
diff --git a/dts/bindings/gpio/nordic,nrf-gpio.yaml b/dts/bindings/gpio/nordic,nrf-gpio.yaml
@@ -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:
diff --git a/dts/bindings/gpio/nordic,nrf-port-configs.yaml b/dts/bindings/gpio/nordic,nrf-port-configs.yaml
diff --git a/dts/bindings/misc/nordic,nrf-bicr.yaml b/dts/bindings/misc/nordic,nrf-bicr.yaml
diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
@@ -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 8.0.0 REQUIRED
     COMPONENTS ${nrf_regtool_components}
diff --git a/modules/hal_nordic/Kconfig.nrf_regtool b/modules/hal_nordic/Kconfig.nrf_regtool
@@ -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
diff --git a/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake b/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake
@@ -58,8 +58,6 @@ foreach(component IN LISTS ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS)
     )
     set_property(TARGET runners_yaml_props_target PROPERTY hex_file ${merged_hex_file})
 
-  elseif(component STREQUAL "GENERATE:BICR")
-    nrf_regtool_generate_peripheral(BICR ${PROJECT_BINARY_DIR}/bicr.hex)
   else()
     message(FATAL_ERROR "Unrecognized package component: \"${component}\"")
   endif()
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,6 @@ foreach(component IN LISTS ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS)`
`58`	`58`	`)`
`59`	`59`	`set_property(TARGET runners_yaml_props_target PROPERTY hex_file ${merged_hex_file})`
`60`	`60`
`61`		`- elseif(component STREQUAL "GENERATE:BICR")`
`62`		`- nrf_regtool_generate_peripheral(BICR ${PROJECT_BINARY_DIR}/bicr.hex)`
`63`	`61`	`else()`
`64`	`62`	`message(FATAL_ERROR "Unrecognized package component: \"${component}\"")`
`65`	`63`	`endif()`