michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc: nxp_s32: s32k3: drop M7 suffix from options

Browse source 
The existing S32K3 Kconfig options employ the `M7` suffix, which is
redundant given that all cores in this series utilize an Arm Cortex-M7
core. Therefore, we should remove it.

Signed-off-by: Manuel Argüelles <manuel.arguelles@nxp.com>
This commit is contained in:
Manuel Argüelles 2023-11-06 22:49:27 +07:00 • committed by Mahesh Mahadevan
commit 8ca4f5b4a1
11 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soc/arm/nxp_s32/Kconfig
View file

@ -37,6 +37,6 @@ source "soc/arm/nxp_s32/*/Kconfig.soc"
config SOC_PART_NUMBER
default SOC_PART_NUMBER_S32ZE_R52 if SOC_SERIES_S32ZE_R52
default SOC_PART_NUMBER_S32K3 if SOC_SERIES_S32K3_M7
default SOC_PART_NUMBER_S32K3 if SOC_SERIES_S32K3XX
endif # SOC_FAMILY_NXP_S32

2
soc/arm/nxp_s32/common/CMakeLists.txt
View file

@ -3,4 +3,4 @@
zephyr_include_directories(.)
zephyr_sources(osif.c)
zephyr_sources_ifdef(CONFIG_SOC_SERIES_S32K3_M7 power_soc.c)
zephyr_sources_ifdef(CONFIG_SOC_SERIES_S32K3XX power_soc.c)

2
soc/arm/nxp_s32/common/osif.c
View file

@ -9,7 +9,7 @@
#if defined(CONFIG_SOC_S32Z27_R52)
#include <S32Z2_MSCM.h>
#elif defined(CONFIG_SOC_S32K344_M7)
#elif defined(CONFIG_SOC_S32K344)
#include <S32K344_MSCM.h>
#endif

6
soc/arm/nxp_s32/s32k3/Kconfig.defconfig.s32k344
View file

@ -1,9 +1,9 @@
# S32K344
# NXP S32K344
# Copyright 2023 NXP
# SPDX-License-Identifier: Apache-2.0
if SOC_S32K344_M7
if SOC_S32K344
config SOC
default "s32k344"
@ -11,4 +11,4 @@ config SOC
config FPU
default y
endif # SOC_S32K344_M7
endif # SOC_S32K344

6
soc/arm/nxp_s32/s32k3/Kconfig.defconfig.series
View file

@ -1,9 +1,9 @@
# S32 K M7 core series
# NXP S32K3XX MCU series
# Copyright 2023 NXP
# SPDX-License-Identifier: Apache-2.0
if SOC_SERIES_S32K3_M7
if SOC_SERIES_S32K3XX
config SOC_SERIES
default "s32k3"
@ -34,4 +34,4 @@ endif # NET_L2_ETHERNET
source "soc/arm/nxp_s32/s32k3/Kconfig.defconfig.s32k*"
endif # SOC_SERIES_S32K_M7
endif # SOC_SERIES_S32K3XX

9
soc/arm/nxp_s32/s32k3/Kconfig.series
View file

@ -1,13 +1,14 @@
# NXP S32K3 MCUs family
# NXP S32K3XX MCU series
# Copyright 2023 NXP
# SPDX-License-Identifier: Apache-2.0
config SOC_SERIES_S32K3_M7
bool "S32K3 M7 Core Series"
config SOC_SERIES_S32K3XX
bool "NXP S32K3XX MCU series"
select ARM
select CPU_CORTEX_M7
select SOC_FAMILY_NXP_S32
select HAS_NXP_S32_HAL
select CPU_HAS_FPU
select CPU_HAS_ARM_MPU
select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
@ -21,4 +22,4 @@ config SOC_SERIES_S32K3_M7
select HAS_MCUX_LPSPI
select HAS_MCUX_CACHE
help
Enable support for NXP S32K3 MCUs family on Cortex-M7 cores
Enable support for NXP S32K3XX MCU series.

13
soc/arm/nxp_s32/s32k3/Kconfig.soc
View file

@ -1,19 +1,18 @@
# NXP S32K MCUs family
# NXP S32K3XX MCU series
# Copyright 2023 NXP
# SPDX-License-Identifier: Apache-2.0
choice
prompt "NXP S32K MCUs family SoC Selection"
depends on SOC_SERIES_S32K3_M7
prompt "NXP S32K3XX MCU selection"
depends on SOC_SERIES_S32K3XX
config SOC_S32K344_M7
bool "SOC_S32K_M7"
select HAS_NXP_S32_HAL
config SOC_S32K344
bool "s32k344"
endchoice
if SOC_SERIES_S32K3_M7
if SOC_SERIES_S32K3XX
config SOC_PART_NUMBER_S32K344
bool