kconfig: Use SOC_NRF54H20_ENGB

57300 · 57300 · commit 918e612a9e56 · 2024-10-23T12:00:20.000+02:00
Certain Kconfigs were only enabled for or in relation to nRF54H20 EngC,
which is the default chip revision. Ensure that the same settings are
available on EngB.

Signed-off-by: Grzegorz Swiderski &lt;grzegorz.swiderski@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
+	depends on SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_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"
-	depends on SOC_NRF54H20_CPUAPP
+	depends on SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
 	default y
 	help
 	  This option enable DVFS module which switches frequency and voltage according
diff --git a/samples/benchmarks/coremark/Kconfig b/samples/benchmarks/coremark/Kconfig
@@ -7,8 +7,8 @@
 menu "CoreMark sample"
 
 config APP_MODE_FLASH_AND_RUN
-	bool "Run CoreMark benchmark on start up" if !SOC_NRF54H20_CPUPPR
-	default y if SOC_NRF54H20_CPUPPR
+	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
 	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/modules/app_rpc/zephyr/Kconfig b/samples/peripheral/802154_phy_test/modules/app_rpc/zephyr/Kconfig
@@ -6,6 +6,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_CPURAD
+	depends on SOC_NRF5340_CPUNET || SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
 	select NRF_RPC
 	select NRF_RPC_CBOR
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_SERIES_NRF54LX)
+			    SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD || SOC_SERIES_NRF54LX)
 	depends on DT_HAS_NORDIC_BT_HCI_SDC_ENABLED
 	help
 	  Use SoftDevice Link Layer implementation.
@@ -318,6 +318,7 @@ 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
+	depends on !ESB_NEVER_DISABLE_TX && (SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_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
+	depends on SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
 	bool "Fast radio channel switching [EXPERIMENTAL]"
 	help
 	  This option enables fast radio channel switching.
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_NRF9280_CPUAPP
-	default 3 if SOC_NRF54H20_CPURAD || SOC_NRF9280_CPURAD
+	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 0
 
 config SSF_CLIENT_NRF_RPC_GROUP_NAME
 	string
-	default "app" if SOC_NRF54H20_CPUAPP || SOC_NRF9280_CPUAPP
-	default "rad" if SOC_NRF54H20_CPURAD || SOC_NRF9280_CPURAD
+	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 ""
 
 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)
+	default y if (SOC_NRF5340_CPUNET || SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_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)
+	default y if (SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP)
 
 config NETCORE_REMOTE_BOARD_TARGET_CPUCLUSTER
 	string
 	default "cpunet" if SOC_NRF5340_CPUAPP
-	default "cpurad" if SOC_NRF54H20_CPUAPP
+	default "cpurad" if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_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
+	default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
 
 config PPRCORE_REMOTE_BOARD_TARGET_CPUCLUSTER
 	string
-	default "cpuppr" if SOC_NRF54H20_CPUAPP
+	default "cpuppr" if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
