From acbdf1f53c6b7541f1b84aa74993cb39a3b76519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Arg=C3=BCelles?= Date: Sun, 6 Aug 2023 12:46:58 +0700 Subject: [PATCH] modules: rename S32 to NXP_S32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename module from `S32` to `NXP_S32` to avoid ambiguity. Signed-off-by: Manuel Argüelles --- MAINTAINERS.yml | 2 +- modules/Kconfig | 2 +- modules/{Kconfig.s32 => Kconfig.nxp_s32} | 4 ++-- modules/hal_nxp/CMakeLists.txt | 2 +- soc/arm/nxp_s32/s32k/Kconfig.soc | 2 +- soc/arm/nxp_s32/s32ze/Kconfig.soc | 2 +- west.yml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename modules/{Kconfig.s32 => Kconfig.nxp_s32} (70%) diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index 6a60a9ddc19..3e980a888f1 100644 --- a/MAINTAINERS.yml +++ b/MAINTAINERS.yml @@ -2991,7 +2991,7 @@ West: - modules/hal_nxp/ - modules/Kconfig.imx - modules/Kconfig.mcux - - modules/Kconfig.s32 + - modules/Kconfig.nxp_s32 labels: - manifest-hal_nxp diff --git a/modules/Kconfig b/modules/Kconfig index 8f5a9b55d78..550aaf9b417 100644 --- a/modules/Kconfig +++ b/modules/Kconfig @@ -30,7 +30,7 @@ source "modules/Kconfig.microchip" source "modules/Kconfig.nuvoton" source "modules/Kconfig.open-amp" source "modules/Kconfig.picolibc" -source "modules/Kconfig.s32" +source "modules/Kconfig.nxp_s32" source "modules/Kconfig.silabs" source "modules/Kconfig.simplelink" source "modules/Kconfig.sof" diff --git a/modules/Kconfig.s32 b/modules/Kconfig.nxp_s32 similarity index 70% rename from modules/Kconfig.s32 rename to modules/Kconfig.nxp_s32 index 9d3bc2544a1..284281bc3c9 100644 --- a/modules/Kconfig.s32 +++ b/modules/Kconfig.nxp_s32 @@ -1,9 +1,9 @@ # NXP S32 MCUs family -# Copyright 2022 NXP +# Copyright 2022-2023 NXP # SPDX-License-Identifier: Apache-2.0 -config HAS_S32_HAL +config HAS_NXP_S32_HAL bool select HAS_CMSIS_CORE depends on SOC_FAMILY_S32 diff --git a/modules/hal_nxp/CMakeLists.txt b/modules/hal_nxp/CMakeLists.txt index d187c8fda49..17f5cfdd078 100644 --- a/modules/hal_nxp/CMakeLists.txt +++ b/modules/hal_nxp/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -if(CONFIG_HAS_MCUX OR CONFIG_HAS_IMX_HAL OR CONFIG_HAS_S32_HAL) +if(CONFIG_HAS_MCUX OR CONFIG_HAS_IMX_HAL OR CONFIG_HAS_NXP_S32_HAL) add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR} hal_nxp) add_subdirectory_ifdef(CONFIG_USB_DEVICE_DRIVER usb) diff --git a/soc/arm/nxp_s32/s32k/Kconfig.soc b/soc/arm/nxp_s32/s32k/Kconfig.soc index f54ffe9f903..978c5daf65a 100644 --- a/soc/arm/nxp_s32/s32k/Kconfig.soc +++ b/soc/arm/nxp_s32/s32k/Kconfig.soc @@ -9,7 +9,7 @@ choice config SOC_S32K344_M7 bool "SOC_S32K_M7" - select HAS_S32_HAL + select HAS_NXP_S32_HAL endchoice diff --git a/soc/arm/nxp_s32/s32ze/Kconfig.soc b/soc/arm/nxp_s32/s32ze/Kconfig.soc index d9aa6eb3a19..c8a1322f531 100644 --- a/soc/arm/nxp_s32/s32ze/Kconfig.soc +++ b/soc/arm/nxp_s32/s32ze/Kconfig.soc @@ -9,7 +9,7 @@ choice config SOC_S32Z27_R52 bool "SOC_S32Z27_R52" - select HAS_S32_HAL + select HAS_NXP_S32_HAL endchoice diff --git a/west.yml b/west.yml index 3e7174f6074..249e2a7feec 100644 --- a/west.yml +++ b/west.yml @@ -193,7 +193,7 @@ manifest: groups: - hal - name: hal_nxp - revision: 674aa3834a60720adab03b2ba70c8b4db90f4916 + revision: 4364ed701eb20af90ed1756414015c4db4416318 path: modules/hal/nxp groups: - hal