Skip to content

Commit 6834c28

Browse files
carlescufigmarull
carlescufi
authored and
gmarull
committed
[nrf fromtree] nordic: Remove the nRF54H20 Engineering B
The production version of the nRF54H20 SoC is now available, so remove the initial Engineering B (EngB) preview version. Signed-off-by: Carles Cufi <[email protected]> (cherry picked from commit 9643ca2)
1 parent 5735cca commit 6834c28

File tree

16 files changed

+21
-81
lines changed

16 files changed

+21
-81
lines changed

‎drivers/cache/Kconfig.nrf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ config CACHE_NRF_CACHE
1010

1111
config CACHE_NRF_PATCH_LINEADDR
1212
bool "Patch lineaddr"
13-
default y if SOC_NRF54H20 || SOC_NRF54H20_ENGB
13+
default y if SOC_NRF54H20
1414
help
1515
Manually set 28th bit in the LINEADDR in Trustzone Secure build.

‎modules/hal_nordic/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ endchoice
5555

5656
config NRF_802154_TEMPERATURE_UPDATE
5757
bool "nRF 802.15.4 temperature update"
58-
default y if !SOC_NRF54H20 && !SOC_NRF54H20_ENGB
58+
default y if !SOC_NRF54H20
5959
help
6060
Enable temperature update for nRF 802.15.4 driver
6161

‎modules/hal_nordic/nrfs/Kconfig‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ config NRFS_HAS_VBUS_DETECTOR_SERVICE
4040
config NRFS
4141
bool "nRF Services Support"
4242
select NRFS_LOCAL_DOMAIN if SOC_NRF54H20_CPUAPP || \
43-
SOC_NRF54H20_ENGB_CPUAPP || \
4443
SOC_NRF54H20_CPURAD || \
45-
SOC_NRF54H20_ENGB_CPURAD || \
4644
SOC_NRF9280_CPUAPP || \
4745
SOC_NRF9280_CPURAD
4846
depends on HAS_NRFS
@@ -103,7 +101,7 @@ config NRFS_PMIC_SERVICE_ENABLED
103101
config NRFS_DVFS_SERVICE_ENABLED
104102
bool "DVFS service"
105103
depends on NRFS_HAS_DVFS_SERVICE
106-
default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || SOC_NRF9280_CPUAPP
104+
default y if SOC_NRF54H20_CPUAPP || SOC_NRF9280_CPUAPP
107105

108106
config NRFS_DIAG_SERVICE_ENABLED
109107
bool "System Diagnostics service (only for development purposes)"

‎modules/hal_nordic/nrfx/CMakeLists.txt‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,6 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUPPR NRF54H20_XXAA
4444
NRF_PPR)
4545
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR NRF54H20_XXAA
4646
NRF_FLPR)
47-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP NRF54H20_ENGB_XXAA
48-
NRF_APPLICATION)
49-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD NRF54H20_ENGB_XXAA
50-
NRF_RADIOCORE)
51-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR NRF54H20_ENGB_XXAA
52-
NRF_PPR)
53-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR NRF54H20_ENGB_XXAA
54-
NRF_FLPR)
5547
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15 NRF54L15_XXAA)
5648
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUAPP NRF_APPLICATION)
5749
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR NRF_FLPR)
@@ -230,10 +222,6 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUAPP nrf54h20_application.svd)
230222
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUPPR nrf54h20_ppr.svd)
231223
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR nrf54h20_flpr.svd)
232224
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPURAD nrf54h20_radiocore.svd)
233-
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP nrf54h20_engb_application.svd)
234-
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR nrf54h20_engb_ppr.svd)
235-
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR nrf54h20_engb_flpr.svd)
236-
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD nrf54h20_engb_radiocore.svd)
237225
mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP nrf54l15_application.svd)
238226
mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR nrf54l15_flpr.svd)
239227
mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54l20_enga_application.svd)

‎modules/hal_nordic/nrfx/nrfx_config.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,13 +1121,13 @@
11211121
#include <nrfx_config_nrf5340_application.h>
11221122
#elif defined(NRF5340_XXAA_NETWORK)
11231123
#include <nrfx_config_nrf5340_network.h>
1124-
#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_APPLICATION)
1124+
#elif defined(NRF54H20_XXAA) && defined(NRF_APPLICATION)
11251125
#include <nrfx_config_nrf54h20_application.h>
1126-
#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_RADIOCORE)
1126+
#elif defined(NRF54H20_XXAA) && defined(NRF_RADIOCORE)
11271127
#include <nrfx_config_nrf54h20_radiocore.h>
1128-
#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_PPR)
1128+
#elif defined(NRF54H20_XXAA) && defined(NRF_PPR)
11291129
#include <nrfx_config_nrf54h20_ppr.h>
1130-
#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_FLPR)
1130+
#elif defined(NRF54H20_XXAA) && defined(NRF_FLPR)
11311131
#include <nrfx_config_nrf54h20_flpr.h>
11321132
#elif defined(NRF54L15_XXAA) && defined(NRF_APPLICATION)
11331133
#include <nrfx_config_nrf54l15_application.h>

‎scripts/west_commands/runners/nrf_common.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,10 @@ def program_hex(self):
261261

262262
cpuapp = (
263263
self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPUAPP') or
264-
self.build_conf.getboolean('CONFIG_SOC_NRF54H20_ENGB_CPUAPP') or
265264
self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPUAPP')
266265
)
267266
cpurad = (
268267
self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPURAD') or
269-
self.build_conf.getboolean('CONFIG_SOC_NRF54H20_ENGB_CPURAD') or
270268
self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPURAD')
271269
)
272270

‎soc/nordic/common/vpr/Kconfig.sysbuild‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
config VPR_LAUNCHER
55
bool "VPR launcher"
66
default y
7-
depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
7+
depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
88
help
99
Include VPR launcher in build.
1010
VPR launcher is a minimal sample built for an ARM core that starts given VPR core.

‎soc/nordic/nrf54h/Kconfig‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ config SOC_NRF54H20_CPUAPP_COMMON
3434
config SOC_NRF54H20_CPUAPP
3535
select SOC_NRF54H20_CPUAPP_COMMON
3636

37-
config SOC_NRF54H20_ENGB_CPUAPP
38-
select SOC_NRF54H20_CPUAPP_COMMON
39-
4037
config SOC_NRF54H20_CPURAD_COMMON
4138
bool
4239
select ARM
@@ -61,21 +58,12 @@ config SOC_NRF54H20_CPURAD_COMMON
6158
config SOC_NRF54H20_CPURAD
6259
select SOC_NRF54H20_CPURAD_COMMON
6360

64-
config SOC_NRF54H20_ENGB_CPURAD
65-
select SOC_NRF54H20_CPURAD_COMMON
66-
6761
config SOC_NRF54H20_CPUPPR
6862
depends on RISCV_CORE_NORDIC_VPR
6963

70-
config SOC_NRF54H20_ENGB_CPUPPR
71-
depends on RISCV_CORE_NORDIC_VPR
72-
7364
config SOC_NRF54H20_CPUFLPR
7465
depends on RISCV_CORE_NORDIC_VPR
7566

76-
config SOC_NRF54H20_ENGB_CPUFLPR
77-
depends on RISCV_CORE_NORDIC_VPR
78-
7967
rsource "gpd/Kconfig"
8068

8169
config SOC_NRF54H20_NO_MRAM_LATENCY

‎soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (c) 2024 Nordic Semiconductor ASA
44
# SPDX-License-Identifier: Apache-2.0
55

6-
if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
6+
if SOC_NRF54H20_CPUAPP
77

88
config NUM_IRQS
99
default 471
@@ -14,4 +14,4 @@ config NRF_REGTOOL_GENERATE_UICR
1414
config SHELL_BACKEND_SERIAL
1515
default n if NRF_ETR_SHELL
1616

17-
endif # SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
17+
endif # SOC_NRF54H20_CPUAPP

‎soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2024 Nordic Semiconductor ASA
22
# SPDX-License-Identifier: Apache-2.0
33

4-
if SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR
4+
if SOC_NRF54H20_CPUFLPR
55

66
config NUM_IRQS
77
default 496
@@ -10,4 +10,4 @@ config NUM_IRQS
1010
config ASSERT
1111
default n
1212

13-
endif # SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR
13+
endif # SOC_NRF54H20_CPUFLPR

0 commit comments

Comments
 (0)