michael/zephyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

soc: arm: mps4: Fix SoC Kconfig naming

Browse Source 
Fixes the Kconfig name of this so that it matches the value from
soc.yml, this has not been deprecated because this SoC is a virtual
SoC used only with the boards in zephyr meaning it should not cause
any breakage of out-of-tree boards

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae
2026-01-16 06:58:26 +00:00
committed by Fabio Baltieri
parent fcb77f2491
commit 7d54f9c7c5
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
boards/arm/mps4/Kconfig.mps4
View File

@@ -3,5 +3,5 @@
config BOARD_MPS4
select SOC_SERIES_MPS4
select SOC_MPS4_CORSTONE315 if BOARD_MPS4_CORSTONE315_FVP || BOARD_MPS4_CORSTONE315_FVP_NS
select SOC_MPS4_CORSTONE320 if BOARD_MPS4_CORSTONE320_FVP || BOARD_MPS4_CORSTONE320_FVP_NS
select SOC_CORSTONE315 if BOARD_MPS4_CORSTONE315_FVP || BOARD_MPS4_CORSTONE315_FVP_NS
select SOC_CORSTONE320 if BOARD_MPS4_CORSTONE320_FVP || BOARD_MPS4_CORSTONE320_FVP_NS

4
modules/hal_ethos_u/Kconfig
View File

@@ -14,8 +14,8 @@ menu "Ethos-U NPU configuration"
choice ETHOS_U_NPU_CONFIG
prompt "Ethos-U NPU configuration"
default ETHOS_U55_128 if SOC_SERIES_MPS3
default ETHOS_U65_256 if SOC_MPS4_CORSTONE315
default ETHOS_U85_256 if SOC_MPS4_CORSTONE320
default ETHOS_U65_256 if SOC_CORSTONE315
default ETHOS_U85_256 if SOC_CORSTONE320
default ETHOS_U55_256 if SOC_SERIES_M55M1X
config ETHOS_U55_64
bool "using Ethos-U55 with 64 macs"

8
soc/arm/mps4/Kconfig
View File

@@ -5,7 +5,7 @@ config SOC_SERIES_MPS4
select ARM
select GPIO_MMIO32 if GPIO
config SOC_MPS4_CORSTONE315
config SOC_CORSTONE315
select CPU_CORTEX_M85
select CPU_HAS_ARM_SAU
select CPU_HAS_ARM_MPU
@@ -16,7 +16,7 @@ config SOC_MPS4_CORSTONE315
select ARMV8_1_M_PMU
select ARM_MPU_PXN if ARM_MPU
config SOC_MPS4_CORSTONE320
config SOC_CORSTONE320
select CPU_CORTEX_M85
select CPU_HAS_ARM_SAU
select CPU_HAS_ARM_MPU
@@ -29,5 +29,5 @@ config SOC_MPS4_CORSTONE320
config ARMV8_1_M_PMU_EVENTCNT
int
default 8 if SOC_MPS4_CORSTONE315
default 8 if SOC_MPS4_CORSTONE320
default 8 if SOC_CORSTONE315
default 8 if SOC_CORSTONE320

2
soc/arm/mps4/Kconfig.defconfig.mps4_corstone315
View File

@@ -1,7 +1,7 @@
# Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
# SPDX-License-Identifier: Apache-2.0
if SOC_MPS4_CORSTONE315
if SOC_CORSTONE315
config NUM_IRQS
default 232

2
soc/arm/mps4/Kconfig.defconfig.mps4_corstone320
View File

@@ -1,7 +1,7 @@
# Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
# SPDX-License-Identifier: Apache-2.0
if SOC_MPS4_CORSTONE320
if SOC_CORSTONE320
config NUM_IRQS
default 232

8
soc/arm/mps4/Kconfig.soc
View File

@@ -10,14 +10,14 @@ config SOC_SERIES_MPS4
config SOC_SERIES
default "mps4" if SOC_SERIES_MPS4
config SOC_MPS4_CORSTONE315
config SOC_CORSTONE315
bool
select SOC_SERIES_MPS4
config SOC_MPS4_CORSTONE320
config SOC_CORSTONE320
bool
select SOC_SERIES_MPS4
config SOC
default "corstone315" if SOC_MPS4_CORSTONE315
default "corstone320" if SOC_MPS4_CORSTONE320
default "corstone315" if SOC_CORSTONE315
default "corstone320" if SOC_CORSTONE320

4
tests/arch/arm/arm_mpu_pxn/CMakeLists.txt
View File

@@ -8,5 +8,5 @@ project(arm_mpu_pxn)
target_sources(app PRIVATE src/main.c)
zephyr_linker_sources_ifdef(CONFIG_SOC_CORSTONE300 RAM_SECTIONS mps3_corstone300.ld)
zephyr_linker_sources_ifdef(CONFIG_SOC_CORSTONE310 RAM_SECTIONS mps3_corstone310.ld)
zephyr_linker_sources_ifdef(CONFIG_SOC_MPS4_CORSTONE315 RAM_SECTIONS mps4_corstone315.ld)
zephyr_linker_sources_ifdef(CONFIG_SOC_MPS4_CORSTONE320 RAM_SECTIONS mps4_corstone320.ld)
zephyr_linker_sources_ifdef(CONFIG_SOC_CORSTONE315 RAM_SECTIONS mps4_corstone315.ld)
zephyr_linker_sources_ifdef(CONFIG_SOC_CORSTONE320 RAM_SECTIONS mps4_corstone320.ld)