michaelh/zephyr
1
0
Fork 0
Code Releases Activity

nordic: Remove the nRF54H20 Engineering B

Browse source 
The production version of the nRF54H20 SoC is now available, so remove
the initial Engineering B (EngB) preview version.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2024-10-21 17:13:13 +02:00 • committed by Anas Nashif
commit 9643ca20e9
16 changed files with 21 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soc/nordic/common/vpr/Kconfig.sysbuild
View file

@ -4,7 +4,7 @@
config VPR_LAUNCHER
bool "VPR launcher"
default y
depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
help
Include VPR launcher in build.
VPR launcher is a minimal sample built for an ARM core that starts given VPR core.

12
soc/nordic/nrf54h/Kconfig
View file

@ -34,9 +34,6 @@ config SOC_NRF54H20_CPUAPP_COMMON
config SOC_NRF54H20_CPUAPP
select SOC_NRF54H20_CPUAPP_COMMON
config SOC_NRF54H20_ENGB_CPUAPP
select SOC_NRF54H20_CPUAPP_COMMON
config SOC_NRF54H20_CPURAD_COMMON
bool
select ARM
@ -61,19 +58,10 @@ config SOC_NRF54H20_CPURAD_COMMON
config SOC_NRF54H20_CPURAD
select SOC_NRF54H20_CPURAD_COMMON
config SOC_NRF54H20_ENGB_CPURAD
select SOC_NRF54H20_CPURAD_COMMON
config SOC_NRF54H20_CPUPPR
depends on RISCV_CORE_NORDIC_VPR
config SOC_NRF54H20_ENGB_CPUPPR
depends on RISCV_CORE_NORDIC_VPR
config SOC_NRF54H20_CPUFLPR
depends on RISCV_CORE_NORDIC_VPR
config SOC_NRF54H20_ENGB_CPUFLPR
depends on RISCV_CORE_NORDIC_VPR
rsource "gpd/Kconfig"

4
soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
View file

@ -3,7 +3,7 @@
# Copyright (c) 2024 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
if SOC_NRF54H20_CPUAPP
config NUM_IRQS
default 471
@ -14,4 +14,4 @@ config NRF_REGTOOL_GENERATE_UICR
config SHELL_BACKEND_SERIAL
default n if NRF_ETR_SHELL
endif # SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
endif # SOC_NRF54H20_CPUAPP

4
soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
View file

@ -1,7 +1,7 @@
# Copyright (c) 2024 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
if SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR
if SOC_NRF54H20_CPUFLPR
config NUM_IRQS
default 496
@ -10,4 +10,4 @@ config NUM_IRQS
config ASSERT
default n
endif # SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR
endif # SOC_NRF54H20_CPUFLPR

4
soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
View file

@ -1,7 +1,7 @@
# Copyright (c) 2024 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
if SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR
if SOC_NRF54H20_CPUPPR
config NUM_IRQS
default 496
@ -13,4 +13,4 @@ config SYS_CLOCK_TICKS_PER_SEC
config ASSERT
default n
endif # SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR
endif # SOC_NRF54H20_CPUPPR

4
soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad
View file

@ -3,7 +3,7 @@
# Copyright (c) 2024 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
if SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
if SOC_NRF54H20_CPURAD
config NUM_IRQS
default 471
@ -11,4 +11,4 @@ config NUM_IRQS
config NRF_REGTOOL_GENERATE_UICR
default y
endif # SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
endif # SOC_NRF54H20_CPURAD

32
soc/nordic/nrf54h/Kconfig.soc
View file

@ -9,59 +9,29 @@ config SOC_NRF54H20
help
nRF54H20
config SOC_NRF54H20_ENGB
bool
select SOC_SERIES_NRF54HX
help
nRF54H20 (EngB)
config SOC_NRF54H20_CPUAPP
bool
select SOC_NRF54H20
help
nRF54H20 CPUAPP
config SOC_NRF54H20_ENGB_CPUAPP
bool
select SOC_NRF54H20_ENGB
help
nRF54H20 (EngB) CPUAPP
config SOC_NRF54H20_CPURAD
bool
select SOC_NRF54H20
help
nRF54H20 CPURAD
config SOC_NRF54H20_ENGB_CPURAD
bool
select SOC_NRF54H20_ENGB
help
nRF54H20 (EngB) CPURAD
config SOC_NRF54H20_CPUPPR
bool
select SOC_NRF54H20
help
nRF54H20 CPUPPR
config SOC_NRF54H20_ENGB_CPUPPR
bool
select SOC_NRF54H20_ENGB
help
nRF54H20 (EngB) CPUPPR
config SOC_NRF54H20_CPUFLPR
bool
select SOC_NRF54H20
help
nRF54H20 CPUFLPR
config SOC_NRF54H20_ENGB_CPUFLPR
bool
select SOC_NRF54H20_ENGB
help
nRF54H20 (EngB) CPUFLPR
config SOC
default "nrf54h20" if SOC_NRF54H20 || SOC_NRF54H20_ENGB
default "nrf54h20" if SOC_NRF54H20

3
soc/nordic/nrf54h/gpd/Kconfig
View file

@ -6,7 +6,6 @@ config SOC_NRF54H20_GPD
imply NRFS
imply NRFS_GDPWR_SERVICE_ENABLED
select ONOFF
default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || \
SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD
help
This option enables the Global Power Domain service.

4
soc/nordic/nrf54h/soc.h
View file

@ -9,7 +9,7 @@
#include <soc_nrf_common.h>
#if defined(CONFIG_SOC_NRF54H20_CPUAPP) || defined(CONFIG_SOC_NRF54H20_ENGB_CPUAPP)
#if defined(CONFIG_SOC_NRF54H20_CPUAPP)
#define RAMBLOCK_CONTROL_BIT_ICACHE MEMCONF_POWER_CONTROL_MEM1_Pos
#define RAMBLOCK_CONTROL_BIT_DCACHE MEMCONF_POWER_CONTROL_MEM2_Pos
#define RAMBLOCK_POWER_ID 0
@ -17,7 +17,7 @@
#define RAMBLOCK_RET_MASK (MEMCONF_POWER_RET_MEM0_Msk)
#define RAMBLOCK_RET_BIT_ICACHE MEMCONF_POWER_RET_MEM1_Pos
#define RAMBLOCK_RET_BIT_DCACHE MEMCONF_POWER_RET_MEM2_Pos
#elif defined(CONFIG_SOC_NRF54H20_CPURAD) || defined(CONFIG_SOC_NRF54H20_ENGB_CPURAD)
#elif defined(CONFIG_SOC_NRF54H20_CPURAD)
#define RAMBLOCK_CONTROL_BIT_ICACHE MEMCONF_POWER_CONTROL_MEM6_Pos
#define RAMBLOCK_CONTROL_BIT_DCACHE MEMCONF_POWER_CONTROL_MEM7_Pos
#define RAMBLOCK_POWER_ID 0