From e7baf09ede0a2b4ada8209134f5a0c5a0560b85e Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 2 Feb 2024 09:13:34 +0000 Subject: [PATCH] soc: m48x: Port to HWMv2 Ports the m48x SoC configuration to hardware model version 2 Signed-off-by: Jamie McCrae --- .../numicro}/CMakeLists.txt | 0 .../numicro/Kconfig} | 5 ++++- .../numicro/Kconfig.defconfig} | 2 +- soc/nuvoton/numicro/Kconfig.soc | 12 +++++++++++ .../numicro}/common/pinctrl_soc.h | 0 .../numicro}/m48x/CMakeLists.txt | 2 ++ .../numicro/m48x/Kconfig} | 7 +++---- .../numicro/m48x/Kconfig.defconfig} | 5 +---- .../numicro}/m48x/Kconfig.defconfig.m487 | 0 soc/nuvoton/numicro/m48x/Kconfig.soc | 20 +++++++++++++++++++ .../numicro}/m48x/soc.c | 0 .../numicro}/m48x/soc.h | 0 soc/nuvoton/numicro/soc.yml | 6 ++++++ soc/soc_legacy/arm/nuvoton_numicro/Kconfig | 17 ---------------- .../arm/nuvoton_numicro/m48x/Kconfig.soc | 14 ------------- 15 files changed, 49 insertions(+), 41 deletions(-) rename soc/{soc_legacy/arm/nuvoton_numicro => nuvoton/numicro}/CMakeLists.txt (100%) rename soc/{soc_legacy/arm/nuvoton_numicro/Kconfig.defconfig => nuvoton/numicro/Kconfig} (60%) rename soc/{soc_legacy/arm/nuvoton_numicro/Kconfig.soc => nuvoton/numicro/Kconfig.defconfig} (66%) create mode 100644 soc/nuvoton/numicro/Kconfig.soc rename soc/{soc_legacy/arm/nuvoton_numicro => nuvoton/numicro}/common/pinctrl_soc.h (100%) rename soc/{soc_legacy/arm/nuvoton_numicro => nuvoton/numicro}/m48x/CMakeLists.txt (88%) rename soc/{soc_legacy/arm/nuvoton_numicro/m48x/Kconfig.series => nuvoton/numicro/m48x/Kconfig} (69%) rename soc/{soc_legacy/arm/nuvoton_numicro/m48x/Kconfig.defconfig.series => nuvoton/numicro/m48x/Kconfig.defconfig} (60%) rename soc/{soc_legacy/arm/nuvoton_numicro => nuvoton/numicro}/m48x/Kconfig.defconfig.m487 (100%) create mode 100644 soc/nuvoton/numicro/m48x/Kconfig.soc rename soc/{soc_legacy/arm/nuvoton_numicro => nuvoton/numicro}/m48x/soc.c (100%) rename soc/{soc_legacy/arm/nuvoton_numicro => nuvoton/numicro}/m48x/soc.h (100%) create mode 100644 soc/nuvoton/numicro/soc.yml delete mode 100644 soc/soc_legacy/arm/nuvoton_numicro/Kconfig delete mode 100644 soc/soc_legacy/arm/nuvoton_numicro/m48x/Kconfig.soc diff --git a/soc/soc_legacy/arm/nuvoton_numicro/CMakeLists.txt b/soc/nuvoton/numicro/CMakeLists.txt similarity index 100% rename from soc/soc_legacy/arm/nuvoton_numicro/CMakeLists.txt rename to soc/nuvoton/numicro/CMakeLists.txt diff --git a/soc/soc_legacy/arm/nuvoton_numicro/Kconfig.defconfig b/soc/nuvoton/numicro/Kconfig similarity index 60% rename from soc/soc_legacy/arm/nuvoton_numicro/Kconfig.defconfig rename to soc/nuvoton/numicro/Kconfig index 9276fa5b316..c1a99badad3 100644 --- a/soc/soc_legacy/arm/nuvoton_numicro/Kconfig.defconfig +++ b/soc/nuvoton/numicro/Kconfig @@ -3,4 +3,7 @@ # Copyright (c) 2020 Linumiz # Author: Saravanan Sekar -source "soc/soc_legacy/arm/nuvoton_numicro/*/Kconfig.defconfig.series" +config SOC_FAMILY_NUMICRO + select PLATFORM_SPECIFIC_INIT + +rsource "*/Kconfig" diff --git a/soc/soc_legacy/arm/nuvoton_numicro/Kconfig.soc b/soc/nuvoton/numicro/Kconfig.defconfig similarity index 66% rename from soc/soc_legacy/arm/nuvoton_numicro/Kconfig.soc rename to soc/nuvoton/numicro/Kconfig.defconfig index e3b447b3b87..cc783d8e193 100644 --- a/soc/soc_legacy/arm/nuvoton_numicro/Kconfig.soc +++ b/soc/nuvoton/numicro/Kconfig.defconfig @@ -3,4 +3,4 @@ # Copyright (c) 2020 Linumiz # Author: Saravanan Sekar -source "soc/soc_legacy/arm/nuvoton_numicro/*/Kconfig.series" +rsource "*/Kconfig.defconfig" diff --git a/soc/nuvoton/numicro/Kconfig.soc b/soc/nuvoton/numicro/Kconfig.soc new file mode 100644 index 00000000000..157191afeb9 --- /dev/null +++ b/soc/nuvoton/numicro/Kconfig.soc @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: Apache-2.0 +# +# Copyright (c) 2020 Linumiz +# Author: Saravanan Sekar + +config SOC_FAMILY_NUMICRO + bool + +config SOC_FAMILY + default "numicro" if SOC_FAMILY_NUMICRO + +rsource "*/Kconfig.soc" diff --git a/soc/soc_legacy/arm/nuvoton_numicro/common/pinctrl_soc.h b/soc/nuvoton/numicro/common/pinctrl_soc.h similarity index 100% rename from soc/soc_legacy/arm/nuvoton_numicro/common/pinctrl_soc.h rename to soc/nuvoton/numicro/common/pinctrl_soc.h diff --git a/soc/soc_legacy/arm/nuvoton_numicro/m48x/CMakeLists.txt b/soc/nuvoton/numicro/m48x/CMakeLists.txt similarity index 88% rename from soc/soc_legacy/arm/nuvoton_numicro/m48x/CMakeLists.txt rename to soc/nuvoton/numicro/m48x/CMakeLists.txt index 322465a92ce..71fa70ed04b 100644 --- a/soc/soc_legacy/arm/nuvoton_numicro/m48x/CMakeLists.txt +++ b/soc/nuvoton/numicro/m48x/CMakeLists.txt @@ -5,4 +5,6 @@ zephyr_sources(soc.c) +zephyr_include_directories(.) + set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "") diff --git a/soc/soc_legacy/arm/nuvoton_numicro/m48x/Kconfig.series b/soc/nuvoton/numicro/m48x/Kconfig similarity index 69% rename from soc/soc_legacy/arm/nuvoton_numicro/m48x/Kconfig.series rename to soc/nuvoton/numicro/m48x/Kconfig index 5e79ddfab9a..6a14e945244 100644 --- a/soc/soc_legacy/arm/nuvoton_numicro/m48x/Kconfig.series +++ b/soc/nuvoton/numicro/m48x/Kconfig @@ -4,12 +4,11 @@ # Author: Saravanan Sekar config SOC_SERIES_M48X - bool "Nuvoton M48X Series MCU" select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT select CPU_HAS_FPU select CPU_HAS_ARM_MPU - select SOC_FAMILY_NUMICRO - help - Enable support for NUVOTON M48X MCU series + +config SOC_M487 + select HAS_NUMICRO_HAL diff --git a/soc/soc_legacy/arm/nuvoton_numicro/m48x/Kconfig.defconfig.series b/soc/nuvoton/numicro/m48x/Kconfig.defconfig similarity index 60% rename from soc/soc_legacy/arm/nuvoton_numicro/m48x/Kconfig.defconfig.series rename to soc/nuvoton/numicro/m48x/Kconfig.defconfig index 64c9ab89d75..9833529015e 100644 --- a/soc/soc_legacy/arm/nuvoton_numicro/m48x/Kconfig.defconfig.series +++ b/soc/nuvoton/numicro/m48x/Kconfig.defconfig @@ -5,9 +5,6 @@ if SOC_SERIES_M48X -source "soc/soc_legacy/arm/nuvoton_numicro/m48x/Kconfig.defconfig.m48*" - -config SOC_SERIES - default "m48x" +rsource "Kconfig.defconfig.m48*" endif # SOC_SERIES_M48X diff --git a/soc/soc_legacy/arm/nuvoton_numicro/m48x/Kconfig.defconfig.m487 b/soc/nuvoton/numicro/m48x/Kconfig.defconfig.m487 similarity index 100% rename from soc/soc_legacy/arm/nuvoton_numicro/m48x/Kconfig.defconfig.m487 rename to soc/nuvoton/numicro/m48x/Kconfig.defconfig.m487 diff --git a/soc/nuvoton/numicro/m48x/Kconfig.soc b/soc/nuvoton/numicro/m48x/Kconfig.soc new file mode 100644 index 00000000000..8d0efbe0237 --- /dev/null +++ b/soc/nuvoton/numicro/m48x/Kconfig.soc @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: Apache-2.0 +# +# Copyright (c) 2020 Linumiz +# Author: Saravanan Sekar + +config SOC_SERIES_M48X + bool + select SOC_FAMILY_NUMICRO + help + Enable support for NUVOTON M48X MCU series + +config SOC_M487 + bool + select SOC_SERIES_M48X + +config SOC_SERIES + default "m48x" if SOC_SERIES_M48X + +config SOC + default "m487" if SOC_M487 diff --git a/soc/soc_legacy/arm/nuvoton_numicro/m48x/soc.c b/soc/nuvoton/numicro/m48x/soc.c similarity index 100% rename from soc/soc_legacy/arm/nuvoton_numicro/m48x/soc.c rename to soc/nuvoton/numicro/m48x/soc.c diff --git a/soc/soc_legacy/arm/nuvoton_numicro/m48x/soc.h b/soc/nuvoton/numicro/m48x/soc.h similarity index 100% rename from soc/soc_legacy/arm/nuvoton_numicro/m48x/soc.h rename to soc/nuvoton/numicro/m48x/soc.h diff --git a/soc/nuvoton/numicro/soc.yml b/soc/nuvoton/numicro/soc.yml new file mode 100644 index 00000000000..9812e29e4b0 --- /dev/null +++ b/soc/nuvoton/numicro/soc.yml @@ -0,0 +1,6 @@ +family: +- name: numicro + series: + - name: m48x + socs: + - name: m487 diff --git a/soc/soc_legacy/arm/nuvoton_numicro/Kconfig b/soc/soc_legacy/arm/nuvoton_numicro/Kconfig deleted file mode 100644 index b667b497fc5..00000000000 --- a/soc/soc_legacy/arm/nuvoton_numicro/Kconfig +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Copyright (c) 2020 Linumiz -# Author: Saravanan Sekar - -config SOC_FAMILY_NUMICRO - select PLATFORM_SPECIFIC_INIT - bool - -if SOC_FAMILY_NUMICRO -config SOC_FAMILY - string - default "nuvoton_numicro" - -source "soc/soc_legacy/arm/nuvoton_numicro/*/Kconfig.soc" - -endif # SOC_FAMILY_NUMICRO diff --git a/soc/soc_legacy/arm/nuvoton_numicro/m48x/Kconfig.soc b/soc/soc_legacy/arm/nuvoton_numicro/m48x/Kconfig.soc deleted file mode 100644 index cf8ca3d13c5..00000000000 --- a/soc/soc_legacy/arm/nuvoton_numicro/m48x/Kconfig.soc +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Copyright (c) 2020 Linumiz -# Author: Saravanan Sekar - -choice - prompt "NUVOTON M48X MCU Selection" - depends on SOC_SERIES_M48X - -config SOC_M487 - bool "M487" - select HAS_NUMICRO_HAL - -endchoice