From 9643ca20e9bc8df28c02aac923c3a794bbef6f5f Mon Sep 17 00:00:00 2001 From: Carles Cufi Date: Mon, 21 Oct 2024 17:13:13 +0200 Subject: [PATCH] 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 --- drivers/cache/Kconfig.nrf | 2 +- modules/hal_nordic/Kconfig | 2 +- modules/hal_nordic/nrfs/Kconfig | 4 +-- modules/hal_nordic/nrfx/CMakeLists.txt | 12 ------- modules/hal_nordic/nrfx/nrfx_config.h | 8 ++--- scripts/west_commands/runners/nrf_common.py | 2 -- soc/nordic/common/vpr/Kconfig.sysbuild | 2 +- soc/nordic/nrf54h/Kconfig | 12 ------- .../nrf54h/Kconfig.defconfig.nrf54h20_cpuapp | 4 +-- .../nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr | 4 +-- .../nrf54h/Kconfig.defconfig.nrf54h20_cpuppr | 4 +-- .../nrf54h/Kconfig.defconfig.nrf54h20_cpurad | 4 +-- soc/nordic/nrf54h/Kconfig.soc | 32 +------------------ soc/nordic/nrf54h/gpd/Kconfig | 3 +- soc/nordic/nrf54h/soc.h | 4 +-- subsys/logging/frontends/Kconfig | 3 +- 16 files changed, 21 insertions(+), 81 deletions(-) diff --git a/drivers/cache/Kconfig.nrf b/drivers/cache/Kconfig.nrf index ffcbfe66d19..c1cfc2c8c58 100644 --- a/drivers/cache/Kconfig.nrf +++ b/drivers/cache/Kconfig.nrf @@ -10,6 +10,6 @@ config CACHE_NRF_CACHE config CACHE_NRF_PATCH_LINEADDR bool "Patch lineaddr" - default y if SOC_NRF54H20 || SOC_NRF54H20_ENGB + default y if SOC_NRF54H20 help Manually set 28th bit in the LINEADDR in Trustzone Secure build. diff --git a/modules/hal_nordic/Kconfig b/modules/hal_nordic/Kconfig index 9d54c15d715..dd4e0a0859b 100644 --- a/modules/hal_nordic/Kconfig +++ b/modules/hal_nordic/Kconfig @@ -55,7 +55,7 @@ endchoice config NRF_802154_TEMPERATURE_UPDATE bool "nRF 802.15.4 temperature update" - default y if !SOC_NRF54H20 && !SOC_NRF54H20_ENGB + default y if !SOC_NRF54H20 help Enable temperature update for nRF 802.15.4 driver diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig index eafe0616764..8c5b61bb11f 100644 --- a/modules/hal_nordic/nrfs/Kconfig +++ b/modules/hal_nordic/nrfs/Kconfig @@ -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 @@ -103,7 +101,7 @@ config NRFS_PMIC_SERVICE_ENABLED config NRFS_DVFS_SERVICE_ENABLED bool "DVFS service" depends on NRFS_HAS_DVFS_SERVICE - default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || SOC_NRF9280_CPUAPP + default y if SOC_NRF54H20_CPUAPP || SOC_NRF9280_CPUAPP config NRFS_DIAG_SERVICE_ENABLED bool "System Diagnostics service (only for development purposes)" diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt index 6abbaa79dba..51c613f0104 100644 --- a/modules/hal_nordic/nrfx/CMakeLists.txt +++ b/modules/hal_nordic/nrfx/CMakeLists.txt @@ -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) @@ -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) diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h index e52adda9e1c..58e938492ff 100644 --- a/modules/hal_nordic/nrfx/nrfx_config.h +++ b/modules/hal_nordic/nrfx/nrfx_config.h @@ -1048,13 +1048,13 @@ #include #elif defined(NRF5340_XXAA_NETWORK) #include -#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_APPLICATION) +#elif defined(NRF54H20_XXAA) && defined(NRF_APPLICATION) #include -#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_RADIOCORE) +#elif defined(NRF54H20_XXAA) && defined(NRF_RADIOCORE) #include -#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_PPR) +#elif defined(NRF54H20_XXAA) && defined(NRF_PPR) #include -#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_FLPR) +#elif defined(NRF54H20_XXAA) && defined(NRF_FLPR) #include #elif defined(NRF54L15_XXAA) && defined(NRF_APPLICATION) #include diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py index 81aaaf73bf2..220bd204249 100644 --- a/scripts/west_commands/runners/nrf_common.py +++ b/scripts/west_commands/runners/nrf_common.py @@ -307,12 +307,10 @@ class NrfBinaryRunner(ZephyrBinaryRunner): 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 self.build_conf.getboolean('CONFIG_SOC_NRF9280_CPURAD') ) generated_uicr = self.build_conf.getboolean('CONFIG_NRF_REGTOOL_GENERATE_UICR') diff --git a/soc/nordic/common/vpr/Kconfig.sysbuild b/soc/nordic/common/vpr/Kconfig.sysbuild index 8821810d63d..cfbd619f623 100644 --- a/soc/nordic/common/vpr/Kconfig.sysbuild +++ b/soc/nordic/common/vpr/Kconfig.sysbuild @@ -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. diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig index 1b667e25985..0baab4121ad 100644 --- a/soc/nordic/nrf54h/Kconfig +++ b/soc/nordic/nrf54h/Kconfig @@ -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" diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp index 43aed154ecb..595cc2d3886 100644 --- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp +++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuapp @@ -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 diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr index 97b1e89a9c1..2b792e9f1b9 100644 --- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr +++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuflpr @@ -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 diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr index 02649146ad7..bf7c12a3a69 100644 --- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr +++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpuppr @@ -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 diff --git a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad index 9ad0b30e1c8..4437e7aadc4 100644 --- a/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad +++ b/soc/nordic/nrf54h/Kconfig.defconfig.nrf54h20_cpurad @@ -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 diff --git a/soc/nordic/nrf54h/Kconfig.soc b/soc/nordic/nrf54h/Kconfig.soc index 852e92bb138..459854e13b2 100644 --- a/soc/nordic/nrf54h/Kconfig.soc +++ b/soc/nordic/nrf54h/Kconfig.soc @@ -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 diff --git a/soc/nordic/nrf54h/gpd/Kconfig b/soc/nordic/nrf54h/gpd/Kconfig index b9bd568cda6..98b374f6de9 100644 --- a/soc/nordic/nrf54h/gpd/Kconfig +++ b/soc/nordic/nrf54h/gpd/Kconfig @@ -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. diff --git a/soc/nordic/nrf54h/soc.h b/soc/nordic/nrf54h/soc.h index db79e2c8c72..566c07a8c2c 100644 --- a/soc/nordic/nrf54h/soc.h +++ b/soc/nordic/nrf54h/soc.h @@ -9,7 +9,7 @@ #include -#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 diff --git a/subsys/logging/frontends/Kconfig b/subsys/logging/frontends/Kconfig index ec3945fa1ff..ec045846806 100644 --- a/subsys/logging/frontends/Kconfig +++ b/subsys/logging/frontends/Kconfig @@ -47,8 +47,7 @@ config LOG_FRONTEND_STMESP_DICT config LOG_FRONTEND_STMESP_FSC bool "Send fully self-contained messages" select LOG_MSG_APPEND_RO_STRING_LOC if !(NRF_ETR || \ - SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR || \ - SOC_NRF54H20_CPUFLPR || SOC_NRF54H20_ENGB_CPUFLPR) + SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR) config LOG_FRONTEND_STMESP_FLUSH_COUNT int "Number of flushing words"