diff --git a/boards/arm/mr_canhubk3/Kconfig.board b/boards/arm/mr_canhubk3/Kconfig.board index 3cea453a2a2..9c3f4e917b2 100644 --- a/boards/arm/mr_canhubk3/Kconfig.board +++ b/boards/arm/mr_canhubk3/Kconfig.board @@ -3,5 +3,5 @@ config BOARD_MR_CANHUBK3 bool "mr_canhubk3" - depends on SOC_SERIES_S32K3_M7 + depends on SOC_SERIES_S32K3XX select SOC_PART_NUMBER_S32K344 diff --git a/boards/arm/mr_canhubk3/mr_canhubk3_defconfig b/boards/arm/mr_canhubk3/mr_canhubk3_defconfig index 68613d22f11..d8182ce8327 100644 --- a/boards/arm/mr_canhubk3/mr_canhubk3_defconfig +++ b/boards/arm/mr_canhubk3/mr_canhubk3_defconfig @@ -2,8 +2,8 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_BOARD_MR_CANHUBK3=y -CONFIG_SOC_S32K344_M7=y -CONFIG_SOC_SERIES_S32K3_M7=y +CONFIG_SOC_S32K344=y +CONFIG_SOC_SERIES_S32K3XX=y CONFIG_BUILD_OUTPUT_HEX=y # Use Systick as system clock diff --git a/drivers/can/Kconfig.mcux b/drivers/can/Kconfig.mcux index e584996d7c0..5983be36c8a 100644 --- a/drivers/can/Kconfig.mcux +++ b/drivers/can/Kconfig.mcux @@ -31,7 +31,7 @@ config CAN_MCUX_FLEXCAN_WAIT_TIMEOUT config CAN_MAX_MB int "Maximum number of message buffers for concurrent active instances" default 16 - depends on SOC_SERIES_S32K3_M7 + depends on SOC_SERIES_S32K3XX range 1 96 help Defines maximum number of message buffers for concurrent active instances. @@ -42,7 +42,7 @@ config CAN_MAX_FILTER range 1 15 if SOC_SERIES_KINETIS_KE1XF || SOC_SERIES_KINETIS_K6X range 1 13 if SOC_SERIES_IMX_RT && CAN_MCUX_FLEXCAN_FD range 1 63 if SOC_SERIES_IMX_RT - range 1 96 if SOC_SERIES_S32K3_M7 + range 1 96 if SOC_SERIES_S32K3XX help Defines maximum number of concurrent active RX filters diff --git a/drivers/dma/Kconfig.mcux_edma b/drivers/dma/Kconfig.mcux_edma index 0362a5faad6..d1e513e3c13 100644 --- a/drivers/dma/Kconfig.mcux_edma +++ b/drivers/dma/Kconfig.mcux_edma @@ -28,10 +28,10 @@ config DMA_TCD_QUEUE_SIZE config DMA_MCUX_TEST_SLOT_START int "test slot start num" - depends on (SOC_SERIES_KINETIS_K6X || SOC_SERIES_KINETIS_KE1XF || SOC_SERIES_S32K3_M7) + depends on (SOC_SERIES_KINETIS_K6X || SOC_SERIES_KINETIS_KE1XF || SOC_SERIES_S32K3XX) default 58 if SOC_SERIES_KINETIS_K6X default 60 if SOC_SERIES_KINETIS_KE1XF - default 62 if SOC_SERIES_S32K3_M7 + default 62 if SOC_SERIES_S32K3XX help test slot start num diff --git a/soc/arm/nxp_s32/Kconfig b/soc/arm/nxp_s32/Kconfig index 5a33f2065ff..e991957c03e 100644 --- a/soc/arm/nxp_s32/Kconfig +++ b/soc/arm/nxp_s32/Kconfig @@ -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 diff --git a/soc/arm/nxp_s32/common/CMakeLists.txt b/soc/arm/nxp_s32/common/CMakeLists.txt index 13ec5b28101..6142be7ab64 100644 --- a/soc/arm/nxp_s32/common/CMakeLists.txt +++ b/soc/arm/nxp_s32/common/CMakeLists.txt @@ -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) diff --git a/soc/arm/nxp_s32/common/osif.c b/soc/arm/nxp_s32/common/osif.c index 344a1416ee8..52de7a38b7f 100644 --- a/soc/arm/nxp_s32/common/osif.c +++ b/soc/arm/nxp_s32/common/osif.c @@ -9,7 +9,7 @@ #if defined(CONFIG_SOC_S32Z27_R52) #include -#elif defined(CONFIG_SOC_S32K344_M7) +#elif defined(CONFIG_SOC_S32K344) #include #endif diff --git a/soc/arm/nxp_s32/s32k3/Kconfig.defconfig.s32k344 b/soc/arm/nxp_s32/s32k3/Kconfig.defconfig.s32k344 index 3dfab760337..b1b534f6102 100644 --- a/soc/arm/nxp_s32/s32k3/Kconfig.defconfig.s32k344 +++ b/soc/arm/nxp_s32/s32k3/Kconfig.defconfig.s32k344 @@ -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 diff --git a/soc/arm/nxp_s32/s32k3/Kconfig.defconfig.series b/soc/arm/nxp_s32/s32k3/Kconfig.defconfig.series index ed002e941ef..04d54fdc666 100644 --- a/soc/arm/nxp_s32/s32k3/Kconfig.defconfig.series +++ b/soc/arm/nxp_s32/s32k3/Kconfig.defconfig.series @@ -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 diff --git a/soc/arm/nxp_s32/s32k3/Kconfig.series b/soc/arm/nxp_s32/s32k3/Kconfig.series index 3567b562cd7..50be01fe690 100644 --- a/soc/arm/nxp_s32/s32k3/Kconfig.series +++ b/soc/arm/nxp_s32/s32k3/Kconfig.series @@ -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. diff --git a/soc/arm/nxp_s32/s32k3/Kconfig.soc b/soc/arm/nxp_s32/s32k3/Kconfig.soc index 978c5daf65a..298477f71c2 100644 --- a/soc/arm/nxp_s32/s32k3/Kconfig.soc +++ b/soc/arm/nxp_s32/s32k3/Kconfig.soc @@ -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