treewide: Remove references to SOC_NRF54H20_ENGB_CPURAD

carlescufi · carlescufi · commit 5cf56194a4cc · 2024-11-27T12:52:43.000+01:00
The SoC has been removed.

Signed-off-by: Carles Cufi &lt;carles.cufi@nordicsemi.no&gt;
diff --git a/applications/machine_learning/Kconfig.sysbuild b/applications/machine_learning/Kconfig.sysbuild
@@ -26,7 +26,7 @@ config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
 
 config ML_APP_INCLUDE_REMOTE_IMAGE
 	bool "Include remote image build"
-	depends on SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
+	depends on SOC_NRF54H20_CPUAPP
 
 config ML_APP_REMOTE_BOARD
 	string "The name of the board to be used by remote image"
diff --git a/applications/nrf_desktop/src/modules/Kconfig.dvfs b/applications/nrf_desktop/src/modules/Kconfig.dvfs
@@ -6,7 +6,7 @@
 
 menuconfig DESKTOP_DVFS
 	bool "DVFS module [EXPERIMENTAL]"
-	depends on SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
+	depends on SOC_NRF54H20_CPUAPP
 	select EXPERIMENTAL
 	select NRFS_DVFS_SERVICE_ENABLED
 	select CLOCK_CONTROL
diff --git a/samples/benchmarks/coremark/Kconfig b/samples/benchmarks/coremark/Kconfig
@@ -8,8 +8,8 @@ menu "CoreMark sample"
 
 config APP_MODE_FLASH_AND_RUN
 	bool "Run CoreMark benchmark on start up" if \
-		!(SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR)
-	default y if SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR
+		!(SOC_NRF54H20_CPUPPR)
+	default y if SOC_NRF54H20_CPUPPR
 	help
 	  If enabled, CoreMark will start execution immediately after the CPU starts up.
 	  It also disables LEDs and buttons.
diff --git a/samples/peripheral/802154_phy_test/Kconfig.sysbuild b/samples/peripheral/802154_phy_test/Kconfig.sysbuild
@@ -5,7 +5,7 @@
 #
 
 choice APPCORE
-	default APPCORE_REMOTE_SHELL if SOC_NRF5340_CPUNET || SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
+	default APPCORE_REMOTE_SHELL if SOC_NRF5340_CPUNET || SOC_NRF54H20_CPURAD
 
 endchoice
 
diff --git a/samples/peripheral/802154_phy_test/modules/app_rpc/zephyr/Kconfig b/samples/peripheral/802154_phy_test/modules/app_rpc/zephyr/Kconfig
@@ -7,6 +7,6 @@
 config APP_RPC
 	bool "Enables application module features requiring interaction between cores"
 	depends on SOC_NRF5340_CPUNET || SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP \
-		|| SOC_NRF54H20_ENGB_CPUAPP || SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
+		|| SOC_NRF54H20_CPURAD
 	select NRF_RPC
 	select NRF_RPC_CBOR
diff --git a/samples/peripheral/802154_phy_test/modules/app_rpc/zephyr/src/app_rpc.c b/samples/peripheral/802154_phy_test/modules/app_rpc/zephyr/src/app_rpc.c
@@ -13,10 +13,8 @@
 #include <nrf_rpc_cbor.h>
 #endif
 
-#define IS_RPC_CLIENT (CONFIG_SOC_NRF5340_CPUNET || CONFIG_SOC_NRF54H20_CPURAD \
-		|| CONFIG_SOC_NRF54H20_ENGB_CPURAD)
-#define IS_RPC_SERVER (CONFIG_SOC_NRF5340_CPUAPP || CONFIG_SOC_NRF54H20_CPUAPP \
-		|| CONFIG_SOC_NRF54H20_ENGB_CPURAD)
+#define IS_RPC_CLIENT (CONFIG_SOC_NRF5340_CPUNET || CONFIG_SOC_NRF54H20_CPURAD)
+#define IS_RPC_SERVER (CONFIG_SOC_NRF5340_CPUAPP || CONFIG_SOC_NRF54H20_CPUAPP)
 
 NRF_RPC_IPC_TRANSPORT(app_rpc_tr, DEVICE_DT_GET(DT_NODELABEL(ipc0)), "app_rpc_tr_ept");
 NRF_RPC_GROUP_DEFINE(app_rpc_grp, "app_rpc_grp", &app_rpc_tr, NULL, NULL, NULL);
diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
@@ -45,7 +45,7 @@ config BT_LL_SOFTDEVICE
 	select BT_CTLR_SUBRATING_SUPPORT
 	select BT_LL_SOFTDEVICE_HEADERS_INCLUDE
 	depends on (SOC_SERIES_BSIM_NRFXX || SOC_SERIES_NRF52X || SOC_COMPATIBLE_NRF5340_CPUNET ||\
-			    SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD || SOC_SERIES_NRF54LX)
+			    SOC_NRF54H20_CPURAD || SOC_SERIES_NRF54LX)
 	depends on DT_HAS_NORDIC_BT_HCI_SDC_ENABLED
 	help
 	  Use SoftDevice Link Layer implementation.
@@ -318,7 +318,6 @@ choice BT_LL_SOFTDEVICE_VARIANT
 						     BT_ISO || \
 						     SOC_COMPATIBLE_NRF5340_CPUNET || \
 						     SOC_NRF54H20_CPURAD || \
-						     SOC_NRF54H20_ENGB_CPURAD || \
 						     SOC_SERIES_NRF54LX)
 	default BT_LL_SOFTDEVICE_CENTRAL if BT_OBSERVER
 	default BT_LL_SOFTDEVICE_PERIPHERAL if BT_BROADCASTER
diff --git a/subsys/esb/Kconfig b/subsys/esb/Kconfig
@@ -150,7 +150,7 @@ config ESB_NEVER_DISABLE_TX
 
 config ESB_FAST_SWITCHING
 	select EXPERIMENTAL
-	depends on !ESB_NEVER_DISABLE_TX && (SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD)
+	depends on !ESB_NEVER_DISABLE_TX && (SOC_NRF54H20_CPURAD)
 	bool "Fast radio TX/RX and RX/TX switching [EXPERIMENTAL]"
 	help
 	  This option enables fast switching between transmit (TX) and receive (RX) modes
@@ -164,7 +164,7 @@ config ESB_FAST_SWITCHING
 
 config ESB_FAST_CHANNEL_SWITCHING
 	select EXPERIMENTAL
-	depends on SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
+	depends on SOC_NRF54H20_CPURAD
 	bool "Fast radio channel switching [EXPERIMENTAL]"
 	help
 	  This option enables fast radio channel switching.
diff --git a/subsys/nrf_security/Kconfig b/subsys/nrf_security/Kconfig
@@ -59,7 +59,7 @@ if NRF_SECURITY
 config MBEDTLS_PSA_CRYPTO_BUILTIN_KEYS
 	bool
 	default y if SOC_SERIES_NRF54LX && PSA_CRYPTO_DRIVER_CRACEN
-	default y if SOC_SERIES_NRF54HX && (SOC_NRF54H20_CPUSEC || SOC_NRF54H20_ENGB_CPUSEC)
+	default y if SOC_SERIES_NRF54HX && SOC_NRF54H20_CPUSEC
 	help
 	  Promptless option used to control if the PSA Crypto core should have support for builtin keys or not.
 
@@ -258,7 +258,4 @@ endchoice
 config SOC_NRF54H20_CPUSEC
 	bool
 
-config SOC_NRF54H20_ENGB_CPUSEC
-	bool
-
 endmenu
diff --git a/subsys/nrf_security/src/drivers/cracen/psa_driver.Kconfig b/subsys/nrf_security/src/drivers/cracen/psa_driver.Kconfig
@@ -1848,7 +1848,7 @@ config PSA_NEED_CRACEN_PLATFORM_KEYS
 	default y
 	depends on PSA_WANT_ALG_GCM
 	depends on PSA_WANT_AES_KEY_SIZE_256
-	depends on (SOC_NRF54H20_CPUSEC || SOC_NRF54H20_ENGB_CPUSEC)
+	depends on SOC_NRF54H20_CPUSEC
 
 
 endmenu
diff --git a/subsys/sdfw_services/Kconfig b/subsys/sdfw_services/Kconfig
@@ -24,14 +24,14 @@ menu "SDFW Service Framework"
 
 config SSF_CLIENT_DOMAIN_ID
 	int
-	default 2 if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || SOC_NRF9280_CPUAPP
-	default 3 if SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD || SOC_NRF9280_CPURAD
+	default 2 if SOC_NRF54H20_CPUAPP || SOC_NRF9280_CPUAPP
+	default 3 if SOC_NRF54H20_CPURAD || SOC_NRF9280_CPURAD
 	default 0
 
 config SSF_CLIENT_NRF_RPC_GROUP_NAME
 	string
-	default "app" if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || SOC_NRF9280_CPUAPP
-	default "rad" if SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD || SOC_NRF9280_CPURAD
+	default "app" if SOC_NRF54H20_CPUAPP || SOC_NRF9280_CPUAPP
+	default "rad" if SOC_NRF54H20_CPURAD || SOC_NRF9280_CPURAD
 	default ""
 
 config SSF_CLIENT_SYS_INIT
diff --git a/sysbuild/Kconfig.appcore b/sysbuild/Kconfig.appcore
@@ -4,7 +4,7 @@
 
 config SUPPORT_APPCORE
 	bool
-	default y if (SOC_NRF5340_CPUNET || SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD)
+	default y if (SOC_NRF5340_CPUNET || SOC_NRF54H20_CPURAD)
 
 config APPCORE_REMOTE_BOARD_TARGET_CPUCLUSTER
 	string
diff --git a/sysbuild/Kconfig.netcore b/sysbuild/Kconfig.netcore
@@ -10,12 +10,12 @@ config EXTERNAL_CONFIGURED_NETCORE
 
 config SUPPORT_NETCORE
 	bool
-	default y if (SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP)
+	default y if (SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP)
 
 config NETCORE_REMOTE_BOARD_TARGET_CPUCLUSTER
 	string
 	default "cpunet" if SOC_NRF5340_CPUAPP
-	default "cpurad" if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
+	default "cpurad" if SOC_NRF54H20_CPUAPP
 
 config NETCORE_REMOTE_DOMAIN
 	string
diff --git a/sysbuild/Kconfig.pprcore b/sysbuild/Kconfig.pprcore
@@ -4,8 +4,8 @@
 
 config SUPPORT_PPRCORE
 	bool
-	default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
+	default y if SOC_NRF54H20_CPUAPP
 
 config PPRCORE_REMOTE_BOARD_TARGET_CPUCLUSTER
 	string
-	default "cpuppr" if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
+	default "cpuppr" if SOC_NRF54H20_CPUAPP
diff --git a/tests/benchmarks/multicore/idle_ppr/remote/CMakeLists.txt b/tests/benchmarks/multicore/idle_ppr/remote/CMakeLists.txt
@@ -11,7 +11,7 @@ project(remote)
 
 target_sources(app PRIVATE ../src/main.c)
 
-if((DEFINED CONFIG_SOC_NRF54H20_CPUPPR) OR (DEFINED CONFIG_SOC_NRF54H20_ENGB_CPUPPR))
+if(DEFINED CONFIG_SOC_NRF54H20_CPUPPR)
 	message(STATUS "Power Mode handler for RISC V is included.")
 	target_sources(app PRIVATE ../src/power_off.c)
 endif()

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`choice APPCORE`
`8`		`- default APPCORE_REMOTE_SHELL if SOC_NRF5340_CPUNET \|\| SOC_NRF54H20_CPURAD \|\| SOC_NRF54H20_ENGB_CPURAD`
	`8`	`+ default APPCORE_REMOTE_SHELL if SOC_NRF5340_CPUNET \|\| SOC_NRF54H20_CPURAD`
`9`	`9`
`10`	`10`	`endchoice`
`11`	`11`