Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nordic: Remove the nRF54H20 Engineering B SoC #80163

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −191
Open

nordic: Remove the nRF54H20 Engineering B SoC #80163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4eada93
boards: nordic: Remove v0.8.0 of the nRF54H20 DK
carlescufi Oct 21, 2024
6ade926
nordic: Remove the nRF54H20 Engineering B
carlescufi Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,9 @@
# SPDX-License-Identifier: Apache-2.0

config BOARD_NRF54H20DK
select SOC_NRF54H20_ENGB_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP && BOARD_REVISION = "0.8.0"
carlescufi marked this conversation as resolved.
Show resolved Hide resolved
select SOC_NRF54H20_ENGB_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD && BOARD_REVISION = "0.8.0"
select SOC_NRF54H20_ENGB_CPUPPR if (BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP) && BOARD_REVISION = "0.8.0"
select SOC_NRF54H20_ENGB_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP) && BOARD_REVISION = "0.8.0"
carlescufi marked this conversation as resolved.
Show resolved Hide resolved
select SOC_NRF54H20_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP && BOARD_REVISION = "0.9.0"
select SOC_NRF54H20_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD && BOARD_REVISION = "0.9.0"
select SOC_NRF54H20_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP
select SOC_NRF54H20_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD
select SOC_NRF54H20_CPUPPR if (BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP) && BOARD_REVISION = "0.9.0"
BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP)
select SOC_NRF54H20_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP) && BOARD_REVISION = "0.9.0"
BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP)
1 change: 0 additions & 1 deletion boards/nordic/nrf54h20dk/board.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ board:
format: major.minor.patch
default: "0.9.0"
revisions:
- name: "0.8.0"
- name: "0.9.0"
24 changes: 0 additions & 24 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions modules/hal_nordic/nrfs/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ config NRFS_HAS_VBUS_DETECTOR_SERVICE
config NRFS
bool "nRF Services Support"
select NRFS_LOCAL_DOMAIN if SOC_NRF54H20_CPUAPP || \
SOC_NRF54H20_ENGB_CPUAPP || \
SOC_NRF54H20_CPURAD || \
SOC_NRF54H20_ENGB_CPURAD || \
SOC_NRF9280_CPUAPP || \
SOC_NRF9280_CPURAD
depends on HAS_NRFS
Expand Down
12 changes: 0 additions & 12 deletions modules/hal_nordic/nrfx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,6 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUPPR NRF54H20_XXAA
NRF_PPR)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR NRF54H20_XXAA
NRF_FLPR)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP NRF54H20_ENGB_XXAA
NRF_APPLICATION)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD NRF54H20_ENGB_XXAA
NRF_RADIOCORE)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR NRF54H20_ENGB_XXAA
NRF_PPR)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR NRF54H20_ENGB_XXAA
NRF_FLPR)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15 NRF54L15_XXAA)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUAPP NRF_APPLICATION)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR NRF_FLPR)
Expand Down Expand Up @@ -226,10 +218,6 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUAPP nrf54h20_application.svd)
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUPPR nrf54h20_ppr.svd)
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR nrf54h20_flpr.svd)
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPURAD nrf54h20_radiocore.svd)
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP nrf54h20_engb_application.svd)
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR nrf54h20_engb_ppr.svd)
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR nrf54h20_engb_flpr.svd)
mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD nrf54h20_engb_radiocore.svd)
mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP nrf54l15_application.svd)
mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR nrf54l15_flpr.svd)
mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54l20_enga_application.svd)
Expand Down
8 changes: 4 additions & 4 deletions modules/hal_nordic/nrfx/nrfx_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,15 +1048,15 @@
#include <nrfx_config_nrf5340_application.h>
#elif defined(NRF5340_XXAA_NETWORK)
#include <nrfx_config_nrf5340_network.h>
#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_APPLICATION)
#elif defined(NRF54H20_XXAA) && defined(NRF_APPLICATION)
#include <nrfx_config_nrf54h20_application.h>
#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_RADIOCORE)
#elif defined(NRF54H20_XXAA) && defined(NRF_RADIOCORE)
#include <nrfx_config_nrf54h20_radiocore.h>
#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_PPR)
#elif defined(NRF54H20_XXAA) && defined(NRF_PPR)
#include <nrfx_config_nrf54h20_ppr.h>
#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_FLPR)
#elif defined(NRF54H20_XXAA) && defined(NRF_FLPR)
#include <nrfx_config_nrf54h20_flpr.h>
#elif defined(NRF54L15_XXAA) && defined(NRF_APPLICATION)

Check notice on line 1059 in modules/hal_nordic/nrfx/nrfx_config.h

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

modules/hal_nordic/nrfx/nrfx_config.h:1059 
-    #include <nrfx_config_nrf54h20_application.h>
+#include <nrfx_config_nrf54h20_application.h>
 #elif defined(NRF54H20_XXAA) && defined(NRF_RADIOCORE)
-    #include <nrfx_config_nrf54h20_radiocore.h>
+#include <nrfx_config_nrf54h20_radiocore.h>
 #elif defined(NRF54H20_XXAA) && defined(NRF_PPR)
-    #include <nrfx_config_nrf54h20_ppr.h>
+#include <nrfx_config_nrf54h20_ppr.h>
 #elif defined(NRF54H20_XXAA) && defined(NRF_FLPR)
-    #include <nrfx_config_nrf54h20_flpr.h>
+#include <nrfx_config_nrf54h20_flpr.h>
#include <nrfx_config_nrf54l15_application.h>
#elif defined(NRF54L15_XXAA) && defined(NRF_FLPR)
#include <nrfx_config_nrf54l15_flpr.h>
Expand Down
2 changes: 0 additions & 2 deletions scripts/west_commands/runners/nrf_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,10 @@ def program_hex(self):

cpuapp = (
self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPUAPP') or
self.build_conf.getboolean('CONFIG_SOC_NRF54H20_ENGB_CPUAPP') or
self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPUAPP')
)
cpurad = (
self.build_conf.getboolean('CONFIG_SOC_NRF54H20_CPURAD') or
self.build_conf.getboolean('CONFIG_SOC_NRF54H20_ENGB_CPURAD') or
carlescufi marked this conversation as resolved.
Show resolved Hide resolved
self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPURAD')
)

Expand Down
12 changes: 0 additions & 12 deletions soc/nordic/nrf54h/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -61,17 +58,8 @@ 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
4 changes: 2 additions & 2 deletions soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 changes: 2 additions & 2 deletions soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -10,4 +10,4 @@ config NUM_IRQS
config ASSERT
default n

endif # SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR
endif # SOC_NRF54H20_CPUFLPR
4 changes: 2 additions & 2 deletions soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 changes: 2 additions & 2 deletions soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# 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

config NRF_REGTOOL_GENERATE_UICR
default y

endif # SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
endif # SOC_NRF54H20_CPURAD
32 changes: 1 addition & 31 deletions soc/nordic/nrf54h/Kconfig.soc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions soc/nordic/nrf54h/soc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@

#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
#define RAMBLOCK_CONTROL_OFF 0
#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
Expand Down
Loading