From 298f028d209bae971b562fa57ca71076cfd4c70f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Arg=C3=BCelles?= Date: Sun, 6 Aug 2023 12:54:25 +0700 Subject: [PATCH] soc: nxp_s32: rename family to SOC_FAMILY_NXP_S32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename NXP S32 device's family to SOC_FAMILY_NXP_S32 to avoid ambiguity. Signed-off-by: Manuel Argüelles --- modules/Kconfig.mcux | 2 +- modules/Kconfig.nxp_s32 | 2 +- soc/arm/nxp_s32/Kconfig | 8 ++++---- soc/arm/nxp_s32/s32k/Kconfig.series | 2 +- soc/arm/nxp_s32/s32ze/Kconfig.series | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/Kconfig.mcux b/modules/Kconfig.mcux index 88733096b2..67377adcbb 100644 --- a/modules/Kconfig.mcux +++ b/modules/Kconfig.mcux @@ -7,7 +7,7 @@ config HAS_MCUX bool select HAS_CMSIS_CORE depends on SOC_FAMILY_KINETIS || SOC_FAMILY_IMX || SOC_FAMILY_LPC || \ - SOC_FAMILY_NXP_ADSP || SOC_FAMILY_S32 + SOC_FAMILY_NXP_ADSP || SOC_FAMILY_NXP_S32 if HAS_MCUX diff --git a/modules/Kconfig.nxp_s32 b/modules/Kconfig.nxp_s32 index 284281bc3c..588be5a13d 100644 --- a/modules/Kconfig.nxp_s32 +++ b/modules/Kconfig.nxp_s32 @@ -6,4 +6,4 @@ config HAS_NXP_S32_HAL bool select HAS_CMSIS_CORE - depends on SOC_FAMILY_S32 + depends on SOC_FAMILY_NXP_S32 diff --git a/soc/arm/nxp_s32/Kconfig b/soc/arm/nxp_s32/Kconfig index a5c6ea7565..5a33f2065f 100644 --- a/soc/arm/nxp_s32/Kconfig +++ b/soc/arm/nxp_s32/Kconfig @@ -1,10 +1,10 @@ -# Copyright 2022 NXP +# Copyright 2022-2023 NXP # SPDX-License-Identifier: Apache-2.0 -config SOC_FAMILY_S32 +config SOC_FAMILY_NXP_S32 bool -if SOC_FAMILY_S32 +if SOC_FAMILY_NXP_S32 config SOC_FAMILY string @@ -39,4 +39,4 @@ 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 -endif # SOC_FAMILY_S32 +endif # SOC_FAMILY_NXP_S32 diff --git a/soc/arm/nxp_s32/s32k/Kconfig.series b/soc/arm/nxp_s32/s32k/Kconfig.series index b489a8bea5..566c3608fe 100644 --- a/soc/arm/nxp_s32/s32k/Kconfig.series +++ b/soc/arm/nxp_s32/s32k/Kconfig.series @@ -7,7 +7,7 @@ config SOC_SERIES_S32K3_M7 bool "S32K3 M7 Core Series" select ARM select CPU_CORTEX_M7 - select SOC_FAMILY_S32 + select SOC_FAMILY_NXP_S32 select CPU_HAS_FPU select CPU_HAS_ARM_MPU select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS diff --git a/soc/arm/nxp_s32/s32ze/Kconfig.series b/soc/arm/nxp_s32/s32ze/Kconfig.series index b761cd4382..5414de3546 100644 --- a/soc/arm/nxp_s32/s32ze/Kconfig.series +++ b/soc/arm/nxp_s32/s32ze/Kconfig.series @@ -1,6 +1,6 @@ # NXP S32Z/E MCUs family -# Copyright 2022 NXP +# Copyright 2022-2023 NXP # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_S32ZE_R52 @@ -13,6 +13,6 @@ config SOC_SERIES_S32ZE_R52 select GIC_SINGLE_SECURITY_STATE select VFP_DP_D16 select PLATFORM_SPECIFIC_INIT - select SOC_FAMILY_S32 + select SOC_FAMILY_NXP_S32 help Enable support for NXP S32Z/E MCUs family on Cortex-R52 cores.