From 64aaaef5135c1de3285368948388dfe5e4b11c0c Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 2 Jan 2024 15:09:53 +0100 Subject: [PATCH 01/18] soc: gigadevice: port to HWMv2 Port all the Gigadevice SoCs to HWMv2. Signed-off-by: Gerard Marull-Paretas --- samples/drivers/watchdog/sample.yaml | 2 +- soc/arm/gd_gd32/Kconfig | 23 ------------- soc/arm/gd_gd32/Kconfig.soc | 4 --- soc/arm/gd_gd32/gd32a50x/Kconfig.soc | 11 ------- soc/arm/gd_gd32/gd32e10x/Kconfig.soc | 10 ------ soc/arm/gd_gd32/gd32e50x/Kconfig.soc | 11 ------- soc/arm/gd_gd32/gd32f3x0/Kconfig.soc | 10 ------ .../gd_gd32/gd32f403/Kconfig.defconfig.series | 11 ------- soc/arm/gd_gd32/gd32f403/Kconfig.soc | 11 ------- soc/arm/gd_gd32/gd32f4xx/Kconfig.soc | 21 ------------ soc/arm/gd_gd32/gd32l23x/Kconfig.soc | 10 ------ soc/{arm => v2}/gd_gd32/CMakeLists.txt | 0 soc/v2/gd_gd32/Kconfig | 9 +++++ soc/{arm => v2}/gd_gd32/Kconfig.defconfig | 6 ++-- soc/v2/gd_gd32/Kconfig.soc | 10 ++++++ soc/{arm => v2}/gd_gd32/common/CMakeLists.txt | 0 soc/{arm => v2}/gd_gd32/common/pinctrl_soc.h | 0 .../gd_gd32/gd32a50x/CMakeLists.txt | 0 .../gd_gd32/gd32a50x/Kconfig} | 5 +-- .../gd32a50x/Kconfig.defconfig.gd32a503 | 5 +-- .../gd_gd32/gd32a50x/Kconfig.defconfig.series | 4 +-- soc/v2/gd_gd32/gd32a50x/Kconfig.soc | 17 ++++++++++ soc/{arm => v2}/gd_gd32/gd32a50x/gd32_regs.h | 0 soc/{arm => v2}/gd_gd32/gd32a50x/soc.c | 0 soc/{arm => v2}/gd_gd32/gd32a50x/soc.h | 0 .../gd_gd32/gd32e10x/CMakeLists.txt | 0 .../gd_gd32/gd32e10x/Kconfig} | 5 +-- .../gd32e10x/Kconfig.defconfig.gd32e103 | 5 +-- .../gd_gd32/gd32e10x/Kconfig.defconfig.series | 4 +-- soc/v2/gd_gd32/gd32e10x/Kconfig.soc | 17 ++++++++++ soc/{arm => v2}/gd_gd32/gd32e10x/gd32_regs.h | 0 soc/{arm => v2}/gd_gd32/gd32e10x/soc.c | 0 soc/{arm => v2}/gd_gd32/gd32e10x/soc.h | 0 .../gd_gd32/gd32e50x/CMakeLists.txt | 0 .../gd_gd32/gd32e50x/Kconfig} | 5 +-- .../gd32e50x/Kconfig.defconfig.gd32e507 | 3 -- .../gd_gd32/gd32e50x/Kconfig.defconfig.series | 4 +-- soc/v2/gd_gd32/gd32e50x/Kconfig.soc | 17 ++++++++++ soc/{arm => v2}/gd_gd32/gd32e50x/gd32_regs.h | 0 soc/{arm => v2}/gd_gd32/gd32e50x/soc.c | 0 soc/{arm => v2}/gd_gd32/gd32e50x/soc.h | 0 .../gd_gd32/gd32f3x0/CMakeLists.txt | 0 .../gd_gd32/gd32f3x0/Kconfig} | 5 +-- .../gd32f3x0/Kconfig.defconfig.gd32f350 | 5 +-- .../gd_gd32/gd32f3x0/Kconfig.defconfig.series | 4 +-- soc/v2/gd_gd32/gd32f3x0/Kconfig.soc | 17 ++++++++++ soc/{arm => v2}/gd_gd32/gd32f3x0/gd32_regs.h | 0 soc/{arm => v2}/gd_gd32/gd32f3x0/soc.c | 0 soc/{arm => v2}/gd_gd32/gd32f3x0/soc.h | 0 .../gd_gd32/gd32f403/CMakeLists.txt | 0 .../gd_gd32/gd32f403/Kconfig} | 5 +-- .../gd32f403/Kconfig.defconfig.gd32f403 | 5 +-- .../gd_gd32/gd32f403/Kconfig.defconfig.series | 8 +++++ soc/v2/gd_gd32/gd32f403/Kconfig.soc | 17 ++++++++++ soc/{arm => v2}/gd_gd32/gd32f403/gd32_regs.h | 0 soc/{arm => v2}/gd_gd32/gd32f403/soc.c | 0 soc/{arm => v2}/gd_gd32/gd32f403/soc.h | 0 .../gd_gd32/gd32f4xx/CMakeLists.txt | 0 .../gd_gd32/gd32f4xx/Kconfig} | 5 +-- .../gd32f4xx/Kconfig.defconfig.gd32f405 | 3 -- .../gd32f4xx/Kconfig.defconfig.gd32f407 | 3 -- .../gd32f4xx/Kconfig.defconfig.gd32f450 | 3 -- .../gd32f4xx/Kconfig.defconfig.gd32f470 | 3 -- .../gd_gd32/gd32f4xx/Kconfig.defconfig.series | 4 +-- soc/v2/gd_gd32/gd32f4xx/Kconfig.soc | 33 +++++++++++++++++++ soc/{arm => v2}/gd_gd32/gd32f4xx/gd32_regs.h | 0 soc/{arm => v2}/gd_gd32/gd32f4xx/soc.c | 0 soc/{arm => v2}/gd_gd32/gd32f4xx/soc.h | 0 .../gd_gd32/gd32l23x/CMakeLists.txt | 0 .../gd_gd32/gd32l23x/Kconfig} | 5 +-- .../gd32l23x/Kconfig.defconfig.gd32l233 | 5 +-- .../gd_gd32/gd32l23x/Kconfig.defconfig.series | 4 +-- soc/v2/gd_gd32/gd32l23x/Kconfig.soc | 17 ++++++++++ soc/{arm => v2}/gd_gd32/gd32l23x/gd32_regs.h | 0 soc/{arm => v2}/gd_gd32/gd32l23x/soc.c | 0 soc/{arm => v2}/gd_gd32/gd32l23x/soc.h | 0 soc/v2/gd_gd32/soc.yml | 27 +++++++++++++++ .../watchdog/wdt_basic_api/testcase.yaml | 2 +- 78 files changed, 228 insertions(+), 192 deletions(-) delete mode 100644 soc/arm/gd_gd32/Kconfig delete mode 100644 soc/arm/gd_gd32/Kconfig.soc delete mode 100644 soc/arm/gd_gd32/gd32a50x/Kconfig.soc delete mode 100644 soc/arm/gd_gd32/gd32e10x/Kconfig.soc delete mode 100644 soc/arm/gd_gd32/gd32e50x/Kconfig.soc delete mode 100644 soc/arm/gd_gd32/gd32f3x0/Kconfig.soc delete mode 100644 soc/arm/gd_gd32/gd32f403/Kconfig.defconfig.series delete mode 100644 soc/arm/gd_gd32/gd32f403/Kconfig.soc delete mode 100644 soc/arm/gd_gd32/gd32f4xx/Kconfig.soc delete mode 100644 soc/arm/gd_gd32/gd32l23x/Kconfig.soc rename soc/{arm => v2}/gd_gd32/CMakeLists.txt (100%) create mode 100644 soc/v2/gd_gd32/Kconfig rename soc/{arm => v2}/gd_gd32/Kconfig.defconfig (63%) create mode 100644 soc/v2/gd_gd32/Kconfig.soc rename soc/{arm => v2}/gd_gd32/common/CMakeLists.txt (100%) rename soc/{arm => v2}/gd_gd32/common/pinctrl_soc.h (100%) rename soc/{arm => v2}/gd_gd32/gd32a50x/CMakeLists.txt (100%) rename soc/{arm/gd_gd32/gd32a50x/Kconfig.series => v2/gd_gd32/gd32a50x/Kconfig} (69%) rename soc/{arm => v2}/gd_gd32/gd32a50x/Kconfig.defconfig.gd32a503 (85%) rename soc/{arm => v2}/gd_gd32/gd32a50x/Kconfig.defconfig.series (76%) create mode 100644 soc/v2/gd_gd32/gd32a50x/Kconfig.soc rename soc/{arm => v2}/gd_gd32/gd32a50x/gd32_regs.h (100%) rename soc/{arm => v2}/gd_gd32/gd32a50x/soc.c (100%) rename soc/{arm => v2}/gd_gd32/gd32a50x/soc.h (100%) rename soc/{arm => v2}/gd_gd32/gd32e10x/CMakeLists.txt (100%) rename soc/{arm/gd_gd32/gd32e10x/Kconfig.series => v2/gd_gd32/gd32e10x/Kconfig} (68%) rename soc/{arm => v2}/gd_gd32/gd32e10x/Kconfig.defconfig.gd32e103 (85%) rename soc/{arm => v2}/gd_gd32/gd32e10x/Kconfig.defconfig.series (76%) create mode 100644 soc/v2/gd_gd32/gd32e10x/Kconfig.soc rename soc/{arm => v2}/gd_gd32/gd32e10x/gd32_regs.h (100%) rename soc/{arm => v2}/gd_gd32/gd32e10x/soc.c (100%) rename soc/{arm => v2}/gd_gd32/gd32e10x/soc.h (100%) rename soc/{arm => v2}/gd_gd32/gd32e50x/CMakeLists.txt (100%) rename soc/{arm/gd_gd32/gd32e50x/Kconfig.series => v2/gd_gd32/gd32e50x/Kconfig} (66%) rename soc/{arm => v2}/gd_gd32/gd32e50x/Kconfig.defconfig.gd32e507 (88%) rename soc/{arm => v2}/gd_gd32/gd32e50x/Kconfig.defconfig.series (75%) create mode 100644 soc/v2/gd_gd32/gd32e50x/Kconfig.soc rename soc/{arm => v2}/gd_gd32/gd32e50x/gd32_regs.h (100%) rename soc/{arm => v2}/gd_gd32/gd32e50x/soc.c (100%) rename soc/{arm => v2}/gd_gd32/gd32e50x/soc.h (100%) rename soc/{arm => v2}/gd_gd32/gd32f3x0/CMakeLists.txt (100%) rename soc/{arm/gd_gd32/gd32f3x0/Kconfig.series => v2/gd_gd32/gd32f3x0/Kconfig} (60%) rename soc/{arm => v2}/gd_gd32/gd32f3x0/Kconfig.defconfig.gd32f350 (83%) rename soc/{arm => v2}/gd_gd32/gd32f3x0/Kconfig.defconfig.series (73%) create mode 100644 soc/v2/gd_gd32/gd32f3x0/Kconfig.soc rename soc/{arm => v2}/gd_gd32/gd32f3x0/gd32_regs.h (100%) rename soc/{arm => v2}/gd_gd32/gd32f3x0/soc.c (100%) rename soc/{arm => v2}/gd_gd32/gd32f3x0/soc.h (100%) rename soc/{arm => v2}/gd_gd32/gd32f403/CMakeLists.txt (100%) rename soc/{arm/gd_gd32/gd32f403/Kconfig.series => v2/gd_gd32/gd32f403/Kconfig} (68%) rename soc/{arm => v2}/gd_gd32/gd32f403/Kconfig.defconfig.gd32f403 (84%) create mode 100644 soc/v2/gd_gd32/gd32f403/Kconfig.defconfig.series create mode 100644 soc/v2/gd_gd32/gd32f403/Kconfig.soc rename soc/{arm => v2}/gd_gd32/gd32f403/gd32_regs.h (100%) rename soc/{arm => v2}/gd_gd32/gd32f403/soc.c (100%) rename soc/{arm => v2}/gd_gd32/gd32f403/soc.h (100%) rename soc/{arm => v2}/gd_gd32/gd32f4xx/CMakeLists.txt (100%) rename soc/{arm/gd_gd32/gd32f4xx/Kconfig.series => v2/gd_gd32/gd32f4xx/Kconfig} (63%) rename soc/{arm => v2}/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f405 (88%) rename soc/{arm => v2}/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f407 (89%) rename soc/{arm => v2}/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f450 (88%) rename soc/{arm => v2}/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f470 (87%) rename soc/{arm => v2}/gd_gd32/gd32f4xx/Kconfig.defconfig.series (75%) create mode 100644 soc/v2/gd_gd32/gd32f4xx/Kconfig.soc rename soc/{arm => v2}/gd_gd32/gd32f4xx/gd32_regs.h (100%) rename soc/{arm => v2}/gd_gd32/gd32f4xx/soc.c (100%) rename soc/{arm => v2}/gd_gd32/gd32f4xx/soc.h (100%) rename soc/{arm => v2}/gd_gd32/gd32l23x/CMakeLists.txt (100%) rename soc/{arm/gd_gd32/gd32l23x/Kconfig.series => v2/gd_gd32/gd32l23x/Kconfig} (64%) rename soc/{arm => v2}/gd_gd32/gd32l23x/Kconfig.defconfig.gd32l233 (83%) rename soc/{arm => v2}/gd_gd32/gd32l23x/Kconfig.defconfig.series (73%) create mode 100644 soc/v2/gd_gd32/gd32l23x/Kconfig.soc rename soc/{arm => v2}/gd_gd32/gd32l23x/gd32_regs.h (100%) rename soc/{arm => v2}/gd_gd32/gd32l23x/soc.c (100%) rename soc/{arm => v2}/gd_gd32/gd32l23x/soc.h (100%) create mode 100644 soc/v2/gd_gd32/soc.yml diff --git a/samples/drivers/watchdog/sample.yaml b/samples/drivers/watchdog/sample.yaml index f3e11dda9b5c34..8300d173bfbbd9 100644 --- a/samples/drivers/watchdog/sample.yaml +++ b/samples/drivers/watchdog/sample.yaml @@ -16,7 +16,7 @@ common: depends_on: watchdog tests: sample.drivers.watchdog: - filter: not (CONFIG_SOC_FAMILY_STM32 or CONFIG_SOC_FAMILY_GD32 or SOC_SERIES_GD32VF103) + filter: not (CONFIG_SOC_FAMILY_STM32 or CONFIG_SOC_FAMILY_GD_GD32 or SOC_SERIES_GD32VF103) platform_exclude: - s32z270dc2_rtu0_r52 - s32z270dc2_rtu1_r52 diff --git a/soc/arm/gd_gd32/Kconfig b/soc/arm/gd_gd32/Kconfig deleted file mode 100644 index 69f21b210d08a2..00000000000000 --- a/soc/arm/gd_gd32/Kconfig +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2021, ATL Electronics -# SPDX-License-Identifier: Apache-2.0 - -config SOC_FAMILY_GD32 - bool - select HAS_GD32_HAL - select BUILD_OUTPUT_HEX - select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE - -config SOC_FAMILY - string - default "gd_gd32" - depends on SOC_FAMILY_GD32 - -config SOC_FAMILY_GD32_ARM - bool - select SOC_FAMILY_GD32 - -if SOC_FAMILY_GD32_ARM - -source "soc/arm/gd_gd32/*/Kconfig.soc" - -endif # SOC_FAMILY_GD32_ARM diff --git a/soc/arm/gd_gd32/Kconfig.soc b/soc/arm/gd_gd32/Kconfig.soc deleted file mode 100644 index 20a2f4c8cb402d..00000000000000 --- a/soc/arm/gd_gd32/Kconfig.soc +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (c) 2021, ATL Electronics -# SPDX-License-Identifier: Apache-2.0 - -source "soc/arm/gd_gd32/*/Kconfig.series" diff --git a/soc/arm/gd_gd32/gd32a50x/Kconfig.soc b/soc/arm/gd_gd32/gd32a50x/Kconfig.soc deleted file mode 100644 index 6601c77c11af7c..00000000000000 --- a/soc/arm/gd_gd32/gd32a50x/Kconfig.soc +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) 2022 YuLong Yao -# SPDX-License-Identifier: Apache-2.0 - -choice - prompt "GigaDevice GD32A50X MCU Selection" - depends on SOC_SERIES_GD32A50X - - config SOC_GD32A503 - bool "gd32a503" - -endchoice diff --git a/soc/arm/gd_gd32/gd32e10x/Kconfig.soc b/soc/arm/gd_gd32/gd32e10x/Kconfig.soc deleted file mode 100644 index 42e6cd14d99085..00000000000000 --- a/soc/arm/gd_gd32/gd32e10x/Kconfig.soc +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2021 YuLong Yao -# SPDX-License-Identifier: Apache-2.0 - -choice - prompt "GigaDevice GD32E103 MCU Selection" - depends on SOC_SERIES_GD32E10X - - config SOC_GD32E103 - bool "gd32e103" -endchoice diff --git a/soc/arm/gd_gd32/gd32e50x/Kconfig.soc b/soc/arm/gd_gd32/gd32e50x/Kconfig.soc deleted file mode 100644 index 98494f0dab48cf..00000000000000 --- a/soc/arm/gd_gd32/gd32e50x/Kconfig.soc +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) 2022, Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -choice - prompt "GigaDevice GD32E50X MCU Selection" - depends on SOC_SERIES_GD32E50X - - config SOC_GD32E507 - bool "gd32e507" - -endchoice diff --git a/soc/arm/gd_gd32/gd32f3x0/Kconfig.soc b/soc/arm/gd_gd32/gd32f3x0/Kconfig.soc deleted file mode 100644 index 1acbaaf4ae0a4b..00000000000000 --- a/soc/arm/gd_gd32/gd32f3x0/Kconfig.soc +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2021 BrainCo Inc. -# SPDX-License-Identifier: Apache-2.0 - -choice - prompt "GigaDevice GD32F3X0 MCU Selection" - depends on SOC_SERIES_GD32F3X0 - - config SOC_GD32F350 - bool "gd32f350" -endchoice diff --git a/soc/arm/gd_gd32/gd32f403/Kconfig.defconfig.series b/soc/arm/gd_gd32/gd32f403/Kconfig.defconfig.series deleted file mode 100644 index 8923e1582a32c7..00000000000000 --- a/soc/arm/gd_gd32/gd32f403/Kconfig.defconfig.series +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) 2021, ATL Electronics -# SPDX-License-Identifier: Apache-2.0 - -if SOC_SERIES_GD32F403 - -source "soc/arm/gd_gd32/gd32f403/Kconfig.defconfig.gd32f403" - -config SOC_SERIES - default "gd32f403" - -endif # SOC_SERIES_GD32F403 diff --git a/soc/arm/gd_gd32/gd32f403/Kconfig.soc b/soc/arm/gd_gd32/gd32f403/Kconfig.soc deleted file mode 100644 index 17e960ce40ca68..00000000000000 --- a/soc/arm/gd_gd32/gd32f403/Kconfig.soc +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) 2021, ATL Electronics -# SPDX-License-Identifier: Apache-2.0 - -choice - prompt "GigaDevice GD32F403 MCU Selection" - depends on SOC_SERIES_GD32F403 - - config SOC_GD32F403 - bool "gd32f403" - -endchoice diff --git a/soc/arm/gd_gd32/gd32f4xx/Kconfig.soc b/soc/arm/gd_gd32/gd32f4xx/Kconfig.soc deleted file mode 100644 index d0cfda3817c5fc..00000000000000 --- a/soc/arm/gd_gd32/gd32f4xx/Kconfig.soc +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2021, Teslabs Engineering S.L. -# Copyright (c) 2022, Rtone. -# SPDX-License-Identifier: Apache-2.0 - -choice - prompt "GigaDevice GD32F4XX MCU Selection" - depends on SOC_SERIES_GD32F4XX - - config SOC_GD32F405 - bool "gd32f405" - - config SOC_GD32F407 - bool "gd32f407" - - config SOC_GD32F450 - bool "gd32f450" - - config SOC_GD32F470 - bool "gd32f470" - -endchoice diff --git a/soc/arm/gd_gd32/gd32l23x/Kconfig.soc b/soc/arm/gd_gd32/gd32l23x/Kconfig.soc deleted file mode 100644 index 927ef4158faeff..00000000000000 --- a/soc/arm/gd_gd32/gd32l23x/Kconfig.soc +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2022 BrainCo Inc. -# SPDX-License-Identifier: Apache-2.0 - -choice - prompt "GigaDevice GD32L23X MCU Selection" - depends on SOC_SERIES_GD32L23X - - config SOC_GD32L233 - bool "gd32l233" -endchoice diff --git a/soc/arm/gd_gd32/CMakeLists.txt b/soc/v2/gd_gd32/CMakeLists.txt similarity index 100% rename from soc/arm/gd_gd32/CMakeLists.txt rename to soc/v2/gd_gd32/CMakeLists.txt diff --git a/soc/v2/gd_gd32/Kconfig b/soc/v2/gd_gd32/Kconfig new file mode 100644 index 00000000000000..0d7fad72c975c5 --- /dev/null +++ b/soc/v2/gd_gd32/Kconfig @@ -0,0 +1,9 @@ +# Copyright (c) 2021, ATL Electronics +# SPDX-License-Identifier: Apache-2.0 + +config SOC_FAMILY_GD_GD32 + select HAS_GD32_HAL + select BUILD_OUTPUT_HEX + select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE + +rsource "*/Kconfig" diff --git a/soc/arm/gd_gd32/Kconfig.defconfig b/soc/v2/gd_gd32/Kconfig.defconfig similarity index 63% rename from soc/arm/gd_gd32/Kconfig.defconfig rename to soc/v2/gd_gd32/Kconfig.defconfig index b6fae5d43ec6ae..345f14c0629798 100644 --- a/soc/arm/gd_gd32/Kconfig.defconfig +++ b/soc/v2/gd_gd32/Kconfig.defconfig @@ -1,9 +1,9 @@ # Copyright (c) 2021, ATL Electronics # SPDX-License-Identifier: Apache-2.0 -if SOC_FAMILY_GD32 +if SOC_FAMILY_GD_GD32 -source "soc/arm/gd_gd32/*/Kconfig.defconfig.series" +rsource "*/Kconfig.defconfig.series" config PINCTRL default y @@ -14,4 +14,4 @@ config RESET config CLOCK_CONTROL default y -endif # SOC_FAMILY_GD32 +endif # SOC_FAMILY_GD_GD32 diff --git a/soc/v2/gd_gd32/Kconfig.soc b/soc/v2/gd_gd32/Kconfig.soc new file mode 100644 index 00000000000000..3b4f6c616b6583 --- /dev/null +++ b/soc/v2/gd_gd32/Kconfig.soc @@ -0,0 +1,10 @@ +# Copyright (c) 2021, ATL Electronics +# SPDX-License-Identifier: Apache-2.0 + +config SOC_FAMILY_GD_GD32 + bool + +config SOC_FAMILY + default "gd_gd32" if SOC_FAMILY_GD_GD32 + +rsource "*/Kconfig.soc" diff --git a/soc/arm/gd_gd32/common/CMakeLists.txt b/soc/v2/gd_gd32/common/CMakeLists.txt similarity index 100% rename from soc/arm/gd_gd32/common/CMakeLists.txt rename to soc/v2/gd_gd32/common/CMakeLists.txt diff --git a/soc/arm/gd_gd32/common/pinctrl_soc.h b/soc/v2/gd_gd32/common/pinctrl_soc.h similarity index 100% rename from soc/arm/gd_gd32/common/pinctrl_soc.h rename to soc/v2/gd_gd32/common/pinctrl_soc.h diff --git a/soc/arm/gd_gd32/gd32a50x/CMakeLists.txt b/soc/v2/gd_gd32/gd32a50x/CMakeLists.txt similarity index 100% rename from soc/arm/gd_gd32/gd32a50x/CMakeLists.txt rename to soc/v2/gd_gd32/gd32a50x/CMakeLists.txt diff --git a/soc/arm/gd_gd32/gd32a50x/Kconfig.series b/soc/v2/gd_gd32/gd32a50x/Kconfig similarity index 69% rename from soc/arm/gd_gd32/gd32a50x/Kconfig.series rename to soc/v2/gd_gd32/gd32a50x/Kconfig index 2488c643727dd9..597a8ff8ca716e 100644 --- a/soc/arm/gd_gd32/gd32a50x/Kconfig.series +++ b/soc/v2/gd_gd32/gd32a50x/Kconfig @@ -2,15 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_GD32A50X - bool "GigaDevice GD32A50X series Cortex-M33 MCU" select ARM select CPU_HAS_ARM_MPU select CPU_HAS_FPU select ARMV8_M_DSP select CPU_CORTEX_M33 - select SOC_FAMILY_GD32_ARM + select SOC_FAMILY_GD_GD32 select GD32_HAS_AF_PINMUX select GD32_HAS_IRC_40K select PLATFORM_SPECIFIC_INIT - help - Enable support for GigaDevice GD32A50X MCU series diff --git a/soc/arm/gd_gd32/gd32a50x/Kconfig.defconfig.gd32a503 b/soc/v2/gd_gd32/gd32a50x/Kconfig.defconfig.gd32a503 similarity index 85% rename from soc/arm/gd_gd32/gd32a50x/Kconfig.defconfig.gd32a503 rename to soc/v2/gd_gd32/gd32a50x/Kconfig.defconfig.gd32a503 index a714d56cb61fd7..6b54ab05e61f1e 100644 --- a/soc/arm/gd_gd32/gd32a50x/Kconfig.defconfig.gd32a503 +++ b/soc/v2/gd_gd32/gd32a50x/Kconfig.defconfig.gd32a503 @@ -1,11 +1,12 @@ # Copyright (c) 2022 YuLong Yao # SPDX-License-Identifier: Apache-2.0 -config SOC - default "gd32a503" +if SOC_GD32A503 config SYS_CLOCK_HW_CYCLES_PER_SEC default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) config NUM_IRQS default 82 + +endif # SOC_GD32A503 diff --git a/soc/arm/gd_gd32/gd32a50x/Kconfig.defconfig.series b/soc/v2/gd_gd32/gd32a50x/Kconfig.defconfig.series similarity index 76% rename from soc/arm/gd_gd32/gd32a50x/Kconfig.defconfig.series rename to soc/v2/gd_gd32/gd32a50x/Kconfig.defconfig.series index 0b250325c457e2..f54d52b13c9cd2 100644 --- a/soc/arm/gd_gd32/gd32a50x/Kconfig.defconfig.series +++ b/soc/v2/gd_gd32/gd32a50x/Kconfig.defconfig.series @@ -3,9 +3,9 @@ if SOC_SERIES_GD32A50X -source "soc/arm/gd_gd32/gd32a50x/Kconfig.defconfig.gd32*" - config SOC_SERIES default "gd32a50x" +rsource "Kconfig.defconfig.gd32*" + endif # SOC_SERIES_GD32A50X diff --git a/soc/v2/gd_gd32/gd32a50x/Kconfig.soc b/soc/v2/gd_gd32/gd32a50x/Kconfig.soc new file mode 100644 index 00000000000000..cf647c71c8435d --- /dev/null +++ b/soc/v2/gd_gd32/gd32a50x/Kconfig.soc @@ -0,0 +1,17 @@ +# Copyright (c) 2022 YuLong Yao +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_GD32A50X + bool + help + Enable support for GigaDevice GD32A50X MCU series + +config SOC_SERIES + default "gd32a50x" if SOC_SERIES_GD32A50X + +config SOC_GD32A503 + bool + select SOC_SERIES_GD32A50X + +config SOC + default "gd32a503" if SOC_GD32A503 diff --git a/soc/arm/gd_gd32/gd32a50x/gd32_regs.h b/soc/v2/gd_gd32/gd32a50x/gd32_regs.h similarity index 100% rename from soc/arm/gd_gd32/gd32a50x/gd32_regs.h rename to soc/v2/gd_gd32/gd32a50x/gd32_regs.h diff --git a/soc/arm/gd_gd32/gd32a50x/soc.c b/soc/v2/gd_gd32/gd32a50x/soc.c similarity index 100% rename from soc/arm/gd_gd32/gd32a50x/soc.c rename to soc/v2/gd_gd32/gd32a50x/soc.c diff --git a/soc/arm/gd_gd32/gd32a50x/soc.h b/soc/v2/gd_gd32/gd32a50x/soc.h similarity index 100% rename from soc/arm/gd_gd32/gd32a50x/soc.h rename to soc/v2/gd_gd32/gd32a50x/soc.h diff --git a/soc/arm/gd_gd32/gd32e10x/CMakeLists.txt b/soc/v2/gd_gd32/gd32e10x/CMakeLists.txt similarity index 100% rename from soc/arm/gd_gd32/gd32e10x/CMakeLists.txt rename to soc/v2/gd_gd32/gd32e10x/CMakeLists.txt diff --git a/soc/arm/gd_gd32/gd32e10x/Kconfig.series b/soc/v2/gd_gd32/gd32e10x/Kconfig similarity index 68% rename from soc/arm/gd_gd32/gd32e10x/Kconfig.series rename to soc/v2/gd_gd32/gd32e10x/Kconfig index 010e649671ca87..9376c467cdab52 100644 --- a/soc/arm/gd_gd32/gd32e10x/Kconfig.series +++ b/soc/v2/gd_gd32/gd32e10x/Kconfig @@ -2,14 +2,11 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_GD32E10X - bool "GigaDevice GD32E10X series Cortex-M4F MCU" select ARM select CPU_HAS_FPU select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_SYSTICK select CPU_CORTEX_M_HAS_VTOR - select SOC_FAMILY_GD32_ARM + select SOC_FAMILY_GD_GD32 select GD32_HAS_AFIO_PINMUX select GD32_HAS_IRC_40K - help - Enable support for GigaDevice GD32E10X MCU series diff --git a/soc/arm/gd_gd32/gd32e10x/Kconfig.defconfig.gd32e103 b/soc/v2/gd_gd32/gd32e10x/Kconfig.defconfig.gd32e103 similarity index 85% rename from soc/arm/gd_gd32/gd32e10x/Kconfig.defconfig.gd32e103 rename to soc/v2/gd_gd32/gd32e10x/Kconfig.defconfig.gd32e103 index 38dfedb9cd05c3..d1b9801bb9a582 100644 --- a/soc/arm/gd_gd32/gd32e10x/Kconfig.defconfig.gd32e103 +++ b/soc/v2/gd_gd32/gd32e10x/Kconfig.defconfig.gd32e103 @@ -1,11 +1,12 @@ # Copyright (c) 2021 YuLong Yao # SPDX-License-Identifier: Apache-2.0 -config SOC - default "gd32e103" +if SOC_GD32E103 config SYS_CLOCK_HW_CYCLES_PER_SEC default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) config NUM_IRQS default 83 + +endif # SOC_GD32E103 diff --git a/soc/arm/gd_gd32/gd32e10x/Kconfig.defconfig.series b/soc/v2/gd_gd32/gd32e10x/Kconfig.defconfig.series similarity index 76% rename from soc/arm/gd_gd32/gd32e10x/Kconfig.defconfig.series rename to soc/v2/gd_gd32/gd32e10x/Kconfig.defconfig.series index f16328e1e70ec6..2aec533c23ccd2 100644 --- a/soc/arm/gd_gd32/gd32e10x/Kconfig.defconfig.series +++ b/soc/v2/gd_gd32/gd32e10x/Kconfig.defconfig.series @@ -3,9 +3,9 @@ if SOC_SERIES_GD32E10X -source "soc/arm/gd_gd32/gd32e10x/Kconfig.defconfig.gd32*" - config SOC_SERIES default "gd32e10x" +rsource "Kconfig.defconfig.gd32*" + endif # SOC_SERIES_GD32E10X diff --git a/soc/v2/gd_gd32/gd32e10x/Kconfig.soc b/soc/v2/gd_gd32/gd32e10x/Kconfig.soc new file mode 100644 index 00000000000000..4daddb9675abcb --- /dev/null +++ b/soc/v2/gd_gd32/gd32e10x/Kconfig.soc @@ -0,0 +1,17 @@ +# Copyright (c) 2021 YuLong Yao +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_GD32E10X + bool + help + Enable support for GigaDevice GD32E10X MCU series + +config SOC_SERIES + default "gd32e10x" if SOC_SERIES_GD32E10X + +config SOC_GD32E103 + bool + select SOC_SERIES_GD32E10X + +config SOC + default "gd32e103" if SOC_GD32E103 diff --git a/soc/arm/gd_gd32/gd32e10x/gd32_regs.h b/soc/v2/gd_gd32/gd32e10x/gd32_regs.h similarity index 100% rename from soc/arm/gd_gd32/gd32e10x/gd32_regs.h rename to soc/v2/gd_gd32/gd32e10x/gd32_regs.h diff --git a/soc/arm/gd_gd32/gd32e10x/soc.c b/soc/v2/gd_gd32/gd32e10x/soc.c similarity index 100% rename from soc/arm/gd_gd32/gd32e10x/soc.c rename to soc/v2/gd_gd32/gd32e10x/soc.c diff --git a/soc/arm/gd_gd32/gd32e10x/soc.h b/soc/v2/gd_gd32/gd32e10x/soc.h similarity index 100% rename from soc/arm/gd_gd32/gd32e10x/soc.h rename to soc/v2/gd_gd32/gd32e10x/soc.h diff --git a/soc/arm/gd_gd32/gd32e50x/CMakeLists.txt b/soc/v2/gd_gd32/gd32e50x/CMakeLists.txt similarity index 100% rename from soc/arm/gd_gd32/gd32e50x/CMakeLists.txt rename to soc/v2/gd_gd32/gd32e50x/CMakeLists.txt diff --git a/soc/arm/gd_gd32/gd32e50x/Kconfig.series b/soc/v2/gd_gd32/gd32e50x/Kconfig similarity index 66% rename from soc/arm/gd_gd32/gd32e50x/Kconfig.series rename to soc/v2/gd_gd32/gd32e50x/Kconfig index 546ca45679341c..eec62ad28617a9 100644 --- a/soc/arm/gd_gd32/gd32e50x/Kconfig.series +++ b/soc/v2/gd_gd32/gd32e50x/Kconfig @@ -2,14 +2,11 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_GD32E50X - bool "GigaDevice GD32E50X series Cortex-M33 MCU" select ARM select CPU_HAS_ARM_MPU select CPU_HAS_FPU select CPU_CORTEX_M33 select ARMV8_M_DSP - select SOC_FAMILY_GD32_ARM + select SOC_FAMILY_GD_GD32 select GD32_HAS_AFIO_PINMUX select GD32_HAS_IRC_40K - help - Enable support for GigaDevice GD32E50X MCU series diff --git a/soc/arm/gd_gd32/gd32e50x/Kconfig.defconfig.gd32e507 b/soc/v2/gd_gd32/gd32e50x/Kconfig.defconfig.gd32e507 similarity index 88% rename from soc/arm/gd_gd32/gd32e50x/Kconfig.defconfig.gd32e507 rename to soc/v2/gd_gd32/gd32e50x/Kconfig.defconfig.gd32e507 index b9d9bbb56976a4..b2b15f6ce00e1c 100644 --- a/soc/arm/gd_gd32/gd32e50x/Kconfig.defconfig.gd32e507 +++ b/soc/v2/gd_gd32/gd32e50x/Kconfig.defconfig.gd32e507 @@ -3,9 +3,6 @@ if SOC_GD32E507 -config SOC - default "gd32e507" - config SYS_CLOCK_HW_CYCLES_PER_SEC default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) diff --git a/soc/arm/gd_gd32/gd32e50x/Kconfig.defconfig.series b/soc/v2/gd_gd32/gd32e50x/Kconfig.defconfig.series similarity index 75% rename from soc/arm/gd_gd32/gd32e50x/Kconfig.defconfig.series rename to soc/v2/gd_gd32/gd32e50x/Kconfig.defconfig.series index f771aea44d912c..1b9f8b981502bd 100644 --- a/soc/arm/gd_gd32/gd32e50x/Kconfig.defconfig.series +++ b/soc/v2/gd_gd32/gd32e50x/Kconfig.defconfig.series @@ -3,9 +3,9 @@ if SOC_SERIES_GD32E50X -source "soc/arm/gd_gd32/gd32e50x/Kconfig.defconfig.gd32*" - config SOC_SERIES default "gd32e50x" +rsource "Kconfig.defconfig.gd32*" + endif # SOC_SERIES_GD32E50X diff --git a/soc/v2/gd_gd32/gd32e50x/Kconfig.soc b/soc/v2/gd_gd32/gd32e50x/Kconfig.soc new file mode 100644 index 00000000000000..905bfa14d19f74 --- /dev/null +++ b/soc/v2/gd_gd32/gd32e50x/Kconfig.soc @@ -0,0 +1,17 @@ +# Copyright (c) 2022, Teslabs Engineering S.L. +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_GD32E50X + bool + help + Enable support for GigaDevice GD32E50X MCU series + +config SOC_SERIES + default "gd32e50x" if SOC_SERIES_GD32E50X + +config SOC_GD32E507 + bool + select SOC_SERIES_GD32E50X + +config SOC + default "gd32e507" if SOC_GD32E507 diff --git a/soc/arm/gd_gd32/gd32e50x/gd32_regs.h b/soc/v2/gd_gd32/gd32e50x/gd32_regs.h similarity index 100% rename from soc/arm/gd_gd32/gd32e50x/gd32_regs.h rename to soc/v2/gd_gd32/gd32e50x/gd32_regs.h diff --git a/soc/arm/gd_gd32/gd32e50x/soc.c b/soc/v2/gd_gd32/gd32e50x/soc.c similarity index 100% rename from soc/arm/gd_gd32/gd32e50x/soc.c rename to soc/v2/gd_gd32/gd32e50x/soc.c diff --git a/soc/arm/gd_gd32/gd32e50x/soc.h b/soc/v2/gd_gd32/gd32e50x/soc.h similarity index 100% rename from soc/arm/gd_gd32/gd32e50x/soc.h rename to soc/v2/gd_gd32/gd32e50x/soc.h diff --git a/soc/arm/gd_gd32/gd32f3x0/CMakeLists.txt b/soc/v2/gd_gd32/gd32f3x0/CMakeLists.txt similarity index 100% rename from soc/arm/gd_gd32/gd32f3x0/CMakeLists.txt rename to soc/v2/gd_gd32/gd32f3x0/CMakeLists.txt diff --git a/soc/arm/gd_gd32/gd32f3x0/Kconfig.series b/soc/v2/gd_gd32/gd32f3x0/Kconfig similarity index 60% rename from soc/arm/gd_gd32/gd32f3x0/Kconfig.series rename to soc/v2/gd_gd32/gd32f3x0/Kconfig index 123d26a6f7ae65..bd1647ad922c4b 100644 --- a/soc/arm/gd_gd32/gd32f3x0/Kconfig.series +++ b/soc/v2/gd_gd32/gd32f3x0/Kconfig @@ -2,12 +2,9 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_GD32F3X0 - bool "GigaDevice GD32F3X0 series Cortex-M4F MCU" select ARM select CPU_HAS_FPU select CPU_CORTEX_M4 - select SOC_FAMILY_GD32_ARM + select SOC_FAMILY_GD_GD32 select GD32_HAS_AF_PINMUX select GD32_HAS_IRC_40K - help - Enable support for GigaDevice GD32F3X0 MCU series diff --git a/soc/arm/gd_gd32/gd32f3x0/Kconfig.defconfig.gd32f350 b/soc/v2/gd_gd32/gd32f3x0/Kconfig.defconfig.gd32f350 similarity index 83% rename from soc/arm/gd_gd32/gd32f3x0/Kconfig.defconfig.gd32f350 rename to soc/v2/gd_gd32/gd32f3x0/Kconfig.defconfig.gd32f350 index 6cd1ca9ec8bed4..ced9dc7095dd60 100644 --- a/soc/arm/gd_gd32/gd32f3x0/Kconfig.defconfig.gd32f350 +++ b/soc/v2/gd_gd32/gd32f3x0/Kconfig.defconfig.gd32f350 @@ -1,11 +1,12 @@ # Copyright (c) 2021 BrainCo Inc. # SPDX-License-Identifier: Apache-2.0 -config SOC - default "gd32f350" +if SOC_GD32F350 config SYS_CLOCK_HW_CYCLES_PER_SEC default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) config NUM_IRQS default 68 + +endif # SOC_GD32F350 diff --git a/soc/arm/gd_gd32/gd32f3x0/Kconfig.defconfig.series b/soc/v2/gd_gd32/gd32f3x0/Kconfig.defconfig.series similarity index 73% rename from soc/arm/gd_gd32/gd32f3x0/Kconfig.defconfig.series rename to soc/v2/gd_gd32/gd32f3x0/Kconfig.defconfig.series index 4852255d255df3..0bb139d227fe8c 100644 --- a/soc/arm/gd_gd32/gd32f3x0/Kconfig.defconfig.series +++ b/soc/v2/gd_gd32/gd32f3x0/Kconfig.defconfig.series @@ -3,9 +3,9 @@ if SOC_SERIES_GD32F3X0 -source "soc/arm/gd_gd32/gd32f3x0/Kconfig.defconfig.gd32*" - config SOC_SERIES default "gd32f3x0" +rsource "Kconfig.defconfig.gd32*" + endif # SOC_SERIES_GD32F3X0 diff --git a/soc/v2/gd_gd32/gd32f3x0/Kconfig.soc b/soc/v2/gd_gd32/gd32f3x0/Kconfig.soc new file mode 100644 index 00000000000000..86a54c40f646ca --- /dev/null +++ b/soc/v2/gd_gd32/gd32f3x0/Kconfig.soc @@ -0,0 +1,17 @@ +# Copyright (c) 2021 BrainCo Inc. +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_GD32F3X0 + bool + help + Enable support for GigaDevice GD32F3X0 MCU series + +config SOC_SERIES + default "gd32f3x0" if SOC_SERIES_GD32F3X0 + +config SOC_GD32F350 + bool + select SOC_SERIES_GD32F3X0 + +config SOC + default "gd32f350" if SOC_GD32F350 diff --git a/soc/arm/gd_gd32/gd32f3x0/gd32_regs.h b/soc/v2/gd_gd32/gd32f3x0/gd32_regs.h similarity index 100% rename from soc/arm/gd_gd32/gd32f3x0/gd32_regs.h rename to soc/v2/gd_gd32/gd32f3x0/gd32_regs.h diff --git a/soc/arm/gd_gd32/gd32f3x0/soc.c b/soc/v2/gd_gd32/gd32f3x0/soc.c similarity index 100% rename from soc/arm/gd_gd32/gd32f3x0/soc.c rename to soc/v2/gd_gd32/gd32f3x0/soc.c diff --git a/soc/arm/gd_gd32/gd32f3x0/soc.h b/soc/v2/gd_gd32/gd32f3x0/soc.h similarity index 100% rename from soc/arm/gd_gd32/gd32f3x0/soc.h rename to soc/v2/gd_gd32/gd32f3x0/soc.h diff --git a/soc/arm/gd_gd32/gd32f403/CMakeLists.txt b/soc/v2/gd_gd32/gd32f403/CMakeLists.txt similarity index 100% rename from soc/arm/gd_gd32/gd32f403/CMakeLists.txt rename to soc/v2/gd_gd32/gd32f403/CMakeLists.txt diff --git a/soc/arm/gd_gd32/gd32f403/Kconfig.series b/soc/v2/gd_gd32/gd32f403/Kconfig similarity index 68% rename from soc/arm/gd_gd32/gd32f403/Kconfig.series rename to soc/v2/gd_gd32/gd32f403/Kconfig index 86c57f224f74a1..90bbba9ace7c91 100644 --- a/soc/arm/gd_gd32/gd32f403/Kconfig.series +++ b/soc/v2/gd_gd32/gd32f403/Kconfig @@ -2,15 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_GD32F403 - bool "GigaDevice GD32F403 series Cortex-M4F MCU" select ARM select CPU_HAS_ARM_MPU select CPU_HAS_FPU select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_SYSTICK select CPU_CORTEX_M_HAS_VTOR - select SOC_FAMILY_GD32_ARM + select SOC_FAMILY_GD_GD32 select GD32_HAS_AFIO_PINMUX select GD32_HAS_IRC_40K - help - Enable support for GigaDevice GD32F403 MCU series diff --git a/soc/arm/gd_gd32/gd32f403/Kconfig.defconfig.gd32f403 b/soc/v2/gd_gd32/gd32f403/Kconfig.defconfig.gd32f403 similarity index 84% rename from soc/arm/gd_gd32/gd32f403/Kconfig.defconfig.gd32f403 rename to soc/v2/gd_gd32/gd32f403/Kconfig.defconfig.gd32f403 index f3bc4ac2209235..2a08dbfb61c18d 100644 --- a/soc/arm/gd_gd32/gd32f403/Kconfig.defconfig.gd32f403 +++ b/soc/v2/gd_gd32/gd32f403/Kconfig.defconfig.gd32f403 @@ -1,11 +1,12 @@ # Copyright (c) 2021, ATL Electronics # SPDX-License-Identifier: Apache-2.0 -config SOC - default "gd32f403" +if SOC_GD32F403 config SYS_CLOCK_HW_CYCLES_PER_SEC default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) config NUM_IRQS default 68 + +endif # SOC_GD32F403 diff --git a/soc/v2/gd_gd32/gd32f403/Kconfig.defconfig.series b/soc/v2/gd_gd32/gd32f403/Kconfig.defconfig.series new file mode 100644 index 00000000000000..6a316658f9f8d8 --- /dev/null +++ b/soc/v2/gd_gd32/gd32f403/Kconfig.defconfig.series @@ -0,0 +1,8 @@ +# Copyright (c) 2021, ATL Electronics +# SPDX-License-Identifier: Apache-2.0 + +if SOC_SERIES_GD32F403 + +rsource "Kconfig.defconfig.gd32*" + +endif # SOC_SERIES_GD32F403 diff --git a/soc/v2/gd_gd32/gd32f403/Kconfig.soc b/soc/v2/gd_gd32/gd32f403/Kconfig.soc new file mode 100644 index 00000000000000..13c080164c2e36 --- /dev/null +++ b/soc/v2/gd_gd32/gd32f403/Kconfig.soc @@ -0,0 +1,17 @@ +# Copyright (c) 2021, ATL Electronics +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_GD32F403 + bool + help + Enable support for GigaDevice GD32F403 MCU series + +config SOC_SERIES + default "gd32f403" if SOC_SERIES_GD32F403 + +config SOC_GD32F403 + bool + select SOC_SERIES_GD32F403 + +config SOC + default "gd32f403" if SOC_GD32F403 diff --git a/soc/arm/gd_gd32/gd32f403/gd32_regs.h b/soc/v2/gd_gd32/gd32f403/gd32_regs.h similarity index 100% rename from soc/arm/gd_gd32/gd32f403/gd32_regs.h rename to soc/v2/gd_gd32/gd32f403/gd32_regs.h diff --git a/soc/arm/gd_gd32/gd32f403/soc.c b/soc/v2/gd_gd32/gd32f403/soc.c similarity index 100% rename from soc/arm/gd_gd32/gd32f403/soc.c rename to soc/v2/gd_gd32/gd32f403/soc.c diff --git a/soc/arm/gd_gd32/gd32f403/soc.h b/soc/v2/gd_gd32/gd32f403/soc.h similarity index 100% rename from soc/arm/gd_gd32/gd32f403/soc.h rename to soc/v2/gd_gd32/gd32f403/soc.h diff --git a/soc/arm/gd_gd32/gd32f4xx/CMakeLists.txt b/soc/v2/gd_gd32/gd32f4xx/CMakeLists.txt similarity index 100% rename from soc/arm/gd_gd32/gd32f4xx/CMakeLists.txt rename to soc/v2/gd_gd32/gd32f4xx/CMakeLists.txt diff --git a/soc/arm/gd_gd32/gd32f4xx/Kconfig.series b/soc/v2/gd_gd32/gd32f4xx/Kconfig similarity index 63% rename from soc/arm/gd_gd32/gd32f4xx/Kconfig.series rename to soc/v2/gd_gd32/gd32f4xx/Kconfig index 9b1d74dfa978d9..6cfa6e018829c1 100644 --- a/soc/arm/gd_gd32/gd32f4xx/Kconfig.series +++ b/soc/v2/gd_gd32/gd32f4xx/Kconfig @@ -2,13 +2,10 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_GD32F4XX - bool "GigaDevice GD32F4XX series Cortex-M4F MCU" select ARM select CPU_HAS_ARM_MPU select CPU_HAS_FPU select CPU_CORTEX_M4 - select SOC_FAMILY_GD32_ARM + select SOC_FAMILY_GD_GD32 select GD32_HAS_AF_PINMUX select GD32_HAS_IRC_32K - help - Enable support for GigaDevice GD32F4XX MCU series diff --git a/soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f405 b/soc/v2/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f405 similarity index 88% rename from soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f405 rename to soc/v2/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f405 index 966bf8e80ac15c..cb70828b02274a 100644 --- a/soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f405 +++ b/soc/v2/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f405 @@ -3,9 +3,6 @@ if SOC_GD32F405 -config SOC - default "gd32f405" - config SYS_CLOCK_HW_CYCLES_PER_SEC default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) diff --git a/soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f407 b/soc/v2/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f407 similarity index 89% rename from soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f407 rename to soc/v2/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f407 index 202bb0f5b2e94e..2fc1491a5db4c5 100644 --- a/soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f407 +++ b/soc/v2/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f407 @@ -3,9 +3,6 @@ if SOC_GD32F407 -config SOC - default "gd32f407" - config SYS_CLOCK_HW_CYCLES_PER_SEC default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) diff --git a/soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f450 b/soc/v2/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f450 similarity index 88% rename from soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f450 rename to soc/v2/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f450 index a4fd9ff66afd14..22d593989a2874 100644 --- a/soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f450 +++ b/soc/v2/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f450 @@ -3,9 +3,6 @@ if SOC_GD32F450 -config SOC - default "gd32f450" - config SYS_CLOCK_HW_CYCLES_PER_SEC default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) diff --git a/soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f470 b/soc/v2/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f470 similarity index 87% rename from soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f470 rename to soc/v2/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f470 index 3ddc0122dc0d00..3656a3acc0bd94 100644 --- a/soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f470 +++ b/soc/v2/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32f470 @@ -3,9 +3,6 @@ if SOC_GD32F470 -config SOC - default "gd32f470" - config SYS_CLOCK_HW_CYCLES_PER_SEC default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) diff --git a/soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.series b/soc/v2/gd_gd32/gd32f4xx/Kconfig.defconfig.series similarity index 75% rename from soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.series rename to soc/v2/gd_gd32/gd32f4xx/Kconfig.defconfig.series index a4ccaed4e802f2..aa626c9523f9b6 100644 --- a/soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.series +++ b/soc/v2/gd_gd32/gd32f4xx/Kconfig.defconfig.series @@ -3,9 +3,9 @@ if SOC_SERIES_GD32F4XX -source "soc/arm/gd_gd32/gd32f4xx/Kconfig.defconfig.gd32*" - config SOC_SERIES default "gd32f4xx" +rsource "Kconfig.defconfig.gd32*" + endif # SOC_SERIES_GD32F4XX diff --git a/soc/v2/gd_gd32/gd32f4xx/Kconfig.soc b/soc/v2/gd_gd32/gd32f4xx/Kconfig.soc new file mode 100644 index 00000000000000..01b06bc1831874 --- /dev/null +++ b/soc/v2/gd_gd32/gd32f4xx/Kconfig.soc @@ -0,0 +1,33 @@ +# Copyright (c) 2021, Teslabs Engineering S.L. +# Copyright (c) 2022, Rtone. +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_GD32F4XX + bool + help + Enable support for GigaDevice GD32F4XX MCU series + +config SOC_SERIES + default "gd32f4xx" if SOC_SERIES_GD32F4XX + +config SOC_GD32F405 + bool + select SOC_SERIES_GD32F4XX + +config SOC_GD32F407 + bool + select SOC_SERIES_GD32F4XX + +config SOC_GD32F450 + bool + select SOC_SERIES_GD32F4XX + +config SOC_GD32F470 + bool + select SOC_SERIES_GD32F4XX + +config SOC + default "gd32f405" if SOC_GD32F405 + default "gd32f407" if SOC_GD32F407 + default "gd32f450" if SOC_GD32F450 + default "gd32f470" if SOC_GD32F470 diff --git a/soc/arm/gd_gd32/gd32f4xx/gd32_regs.h b/soc/v2/gd_gd32/gd32f4xx/gd32_regs.h similarity index 100% rename from soc/arm/gd_gd32/gd32f4xx/gd32_regs.h rename to soc/v2/gd_gd32/gd32f4xx/gd32_regs.h diff --git a/soc/arm/gd_gd32/gd32f4xx/soc.c b/soc/v2/gd_gd32/gd32f4xx/soc.c similarity index 100% rename from soc/arm/gd_gd32/gd32f4xx/soc.c rename to soc/v2/gd_gd32/gd32f4xx/soc.c diff --git a/soc/arm/gd_gd32/gd32f4xx/soc.h b/soc/v2/gd_gd32/gd32f4xx/soc.h similarity index 100% rename from soc/arm/gd_gd32/gd32f4xx/soc.h rename to soc/v2/gd_gd32/gd32f4xx/soc.h diff --git a/soc/arm/gd_gd32/gd32l23x/CMakeLists.txt b/soc/v2/gd_gd32/gd32l23x/CMakeLists.txt similarity index 100% rename from soc/arm/gd_gd32/gd32l23x/CMakeLists.txt rename to soc/v2/gd_gd32/gd32l23x/CMakeLists.txt diff --git a/soc/arm/gd_gd32/gd32l23x/Kconfig.series b/soc/v2/gd_gd32/gd32l23x/Kconfig similarity index 64% rename from soc/arm/gd_gd32/gd32l23x/Kconfig.series rename to soc/v2/gd_gd32/gd32l23x/Kconfig index d6125ca4152fed..f5b4dcba8cd1ed 100644 --- a/soc/arm/gd_gd32/gd32l23x/Kconfig.series +++ b/soc/v2/gd_gd32/gd32l23x/Kconfig @@ -2,13 +2,10 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_GD32L23X - bool "GigaDevice GD32L23X series Cortex-M23 MCU" select ARM select CPU_CORTEX_M23 select CPU_CORTEX_M_HAS_SYSTICK select CPU_CORTEX_M_HAS_VTOR - select SOC_FAMILY_GD32_ARM + select SOC_FAMILY_GD_GD32 select GD32_HAS_AF_PINMUX select GD32_HAS_IRC_32K - help - Enable support for GigaDevice GD32L23X MCU series diff --git a/soc/arm/gd_gd32/gd32l23x/Kconfig.defconfig.gd32l233 b/soc/v2/gd_gd32/gd32l23x/Kconfig.defconfig.gd32l233 similarity index 83% rename from soc/arm/gd_gd32/gd32l23x/Kconfig.defconfig.gd32l233 rename to soc/v2/gd_gd32/gd32l23x/Kconfig.defconfig.gd32l233 index 31ad6d9034eead..bec843575d7082 100644 --- a/soc/arm/gd_gd32/gd32l23x/Kconfig.defconfig.gd32l233 +++ b/soc/v2/gd_gd32/gd32l23x/Kconfig.defconfig.gd32l233 @@ -1,11 +1,12 @@ # Copyright (c) 2022 BrainCo Inc. # SPDX-License-Identifier: Apache-2.0 -config SOC - default "gd32l233" +if SOC_GD32L233 config SYS_CLOCK_HW_CYCLES_PER_SEC default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) config NUM_IRQS default 69 + +endif # SOC_GD32L233 diff --git a/soc/arm/gd_gd32/gd32l23x/Kconfig.defconfig.series b/soc/v2/gd_gd32/gd32l23x/Kconfig.defconfig.series similarity index 73% rename from soc/arm/gd_gd32/gd32l23x/Kconfig.defconfig.series rename to soc/v2/gd_gd32/gd32l23x/Kconfig.defconfig.series index 36a6476dbfbc6a..bc8b2aa4cde864 100644 --- a/soc/arm/gd_gd32/gd32l23x/Kconfig.defconfig.series +++ b/soc/v2/gd_gd32/gd32l23x/Kconfig.defconfig.series @@ -3,9 +3,9 @@ if SOC_SERIES_GD32L23X -source "soc/arm/gd_gd32/gd32l23x/Kconfig.defconfig.gd32*" - config SOC_SERIES default "gd32l23x" +rsource "Kconfig.defconfig.gd32*" + endif # SOC_SERIES_GD32L23X diff --git a/soc/v2/gd_gd32/gd32l23x/Kconfig.soc b/soc/v2/gd_gd32/gd32l23x/Kconfig.soc new file mode 100644 index 00000000000000..d0d9ce2fe9ddc7 --- /dev/null +++ b/soc/v2/gd_gd32/gd32l23x/Kconfig.soc @@ -0,0 +1,17 @@ +# Copyright (c) 2022 BrainCo Inc. +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_GD32L23X + bool + help + Enable support for GigaDevice GD32L23X MCU series + +config SOC_SERIES + default "gd32l23x" if SOC_SERIES_GD32L23X + +config SOC_GD32L233 + bool + select SOC_SERIES_GD32L23X + +config SOC + default "gd32l233" if SOC_GD32L233 diff --git a/soc/arm/gd_gd32/gd32l23x/gd32_regs.h b/soc/v2/gd_gd32/gd32l23x/gd32_regs.h similarity index 100% rename from soc/arm/gd_gd32/gd32l23x/gd32_regs.h rename to soc/v2/gd_gd32/gd32l23x/gd32_regs.h diff --git a/soc/arm/gd_gd32/gd32l23x/soc.c b/soc/v2/gd_gd32/gd32l23x/soc.c similarity index 100% rename from soc/arm/gd_gd32/gd32l23x/soc.c rename to soc/v2/gd_gd32/gd32l23x/soc.c diff --git a/soc/arm/gd_gd32/gd32l23x/soc.h b/soc/v2/gd_gd32/gd32l23x/soc.h similarity index 100% rename from soc/arm/gd_gd32/gd32l23x/soc.h rename to soc/v2/gd_gd32/gd32l23x/soc.h diff --git a/soc/v2/gd_gd32/soc.yml b/soc/v2/gd_gd32/soc.yml new file mode 100644 index 00000000000000..4e7de83750f43d --- /dev/null +++ b/soc/v2/gd_gd32/soc.yml @@ -0,0 +1,27 @@ +family: +- name: gd_gd32 + series: + - name: gd32a50x + socs: + - name: gd32a503 + - name: gd32e10x + socs: + - name: gd32e103 + - name: gd32e50x + socs: + - name: gd32e507 + - name: gd32f3x0 + socs: + - name: gd32f350 + - name: gd32f4xx + socs: + - name: gd32f405 + - name: gd32f407 + - name: gd32f450 + - name: gd32f470 + - name: gd32f403 + socs: + - name: gd32f403 + - name: gd32l23x + socs: + - name: gd32l233 diff --git a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml index a2f8ea97f1f13e..75b3e30b707bbf 100644 --- a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml +++ b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml @@ -9,7 +9,7 @@ tests: not (CONFIG_WDT_SAM or dt_compat_enabled("st,stm32-window-watchdog") or dt_compat_enabled("st,stm32-watchdog") or CONFIG_SOC_FAMILY_LPC or CONFIG_SOC_SERIES_IMX_RT6XX or CONFIG_SOC_SERIES_IMX_RT5XX or - CONFIG_SOC_FAMILY_GD32 or SOC_SERIES_GD32VF103) + CONFIG_SOC_FAMILY_GD_GD32 or SOC_SERIES_GD32VF103) platform_exclude: - mec15xxevb_assy6853 - s32z270dc2_rtu0_r52 From 8809d87c4905ccec70d9cd665c58d3fb6c99b411 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 2 Jan 2024 15:10:27 +0100 Subject: [PATCH 02/18] boards: gd32f450i_eval: convert to HWMv2 Port the board to HWMv2. Signed-off-by: Gerard Marull-Paretas --- boards/arm/gd32f450i_eval/Kconfig.board | 6 ------ boards/arm/gd32f450i_eval/Kconfig.defconfig | 9 --------- boards/v2/gd/gd32f450i_eval/Kconfig.gd32f450i_eval | 5 +++++ boards/{arm => v2/gd}/gd32f450i_eval/board.cmake | 0 boards/v2/gd/gd32f450i_eval/board.yml | 5 +++++ .../gd}/gd32f450i_eval/doc/img/gd32f450i_eval.webp | Bin boards/{arm => v2/gd}/gd32f450i_eval/doc/index.rst | 0 .../gd}/gd32f450i_eval/gd32f450i_eval-pinctrl.dtsi | 0 .../gd}/gd32f450i_eval/gd32f450i_eval.dts | 0 .../gd}/gd32f450i_eval/gd32f450i_eval.yaml | 0 .../gd}/gd32f450i_eval/gd32f450i_eval_defconfig | 4 ---- .../gd}/gd32f450i_eval/support/openocd.cfg | 0 12 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 boards/arm/gd32f450i_eval/Kconfig.board delete mode 100644 boards/arm/gd32f450i_eval/Kconfig.defconfig create mode 100644 boards/v2/gd/gd32f450i_eval/Kconfig.gd32f450i_eval rename boards/{arm => v2/gd}/gd32f450i_eval/board.cmake (100%) create mode 100644 boards/v2/gd/gd32f450i_eval/board.yml rename boards/{arm => v2/gd}/gd32f450i_eval/doc/img/gd32f450i_eval.webp (100%) rename boards/{arm => v2/gd}/gd32f450i_eval/doc/index.rst (100%) rename boards/{arm => v2/gd}/gd32f450i_eval/gd32f450i_eval-pinctrl.dtsi (100%) rename boards/{arm => v2/gd}/gd32f450i_eval/gd32f450i_eval.dts (100%) rename boards/{arm => v2/gd}/gd32f450i_eval/gd32f450i_eval.yaml (100%) rename boards/{arm => v2/gd}/gd32f450i_eval/gd32f450i_eval_defconfig (71%) rename boards/{arm => v2/gd}/gd32f450i_eval/support/openocd.cfg (100%) diff --git a/boards/arm/gd32f450i_eval/Kconfig.board b/boards/arm/gd32f450i_eval/Kconfig.board deleted file mode 100644 index 257da26fd035cb..00000000000000 --- a/boards/arm/gd32f450i_eval/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021, Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32F450I_EVAL - bool "GigaDevice GD32F450I-EVAL" - depends on SOC_GD32F450 diff --git a/boards/arm/gd32f450i_eval/Kconfig.defconfig b/boards/arm/gd32f450i_eval/Kconfig.defconfig deleted file mode 100644 index 3d7624c751e5d5..00000000000000 --- a/boards/arm/gd32f450i_eval/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2021 Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32F450I_EVAL - -config BOARD - default "gd32f450i_eval" - -endif # BOARD_GD32F450I_EVAL diff --git a/boards/v2/gd/gd32f450i_eval/Kconfig.gd32f450i_eval b/boards/v2/gd/gd32f450i_eval/Kconfig.gd32f450i_eval new file mode 100644 index 00000000000000..04574e6b6dfbba --- /dev/null +++ b/boards/v2/gd/gd32f450i_eval/Kconfig.gd32f450i_eval @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32F450I_EVAL + select SOC_GD32F450 diff --git a/boards/arm/gd32f450i_eval/board.cmake b/boards/v2/gd/gd32f450i_eval/board.cmake similarity index 100% rename from boards/arm/gd32f450i_eval/board.cmake rename to boards/v2/gd/gd32f450i_eval/board.cmake diff --git a/boards/v2/gd/gd32f450i_eval/board.yml b/boards/v2/gd/gd32f450i_eval/board.yml new file mode 100644 index 00000000000000..0b1431dd4b9168 --- /dev/null +++ b/boards/v2/gd/gd32f450i_eval/board.yml @@ -0,0 +1,5 @@ +board: + name: gd32f450i_eval + vendor: GigaDevice Semiconductor + socs: + - name: gd32f450 diff --git a/boards/arm/gd32f450i_eval/doc/img/gd32f450i_eval.webp b/boards/v2/gd/gd32f450i_eval/doc/img/gd32f450i_eval.webp similarity index 100% rename from boards/arm/gd32f450i_eval/doc/img/gd32f450i_eval.webp rename to boards/v2/gd/gd32f450i_eval/doc/img/gd32f450i_eval.webp diff --git a/boards/arm/gd32f450i_eval/doc/index.rst b/boards/v2/gd/gd32f450i_eval/doc/index.rst similarity index 100% rename from boards/arm/gd32f450i_eval/doc/index.rst rename to boards/v2/gd/gd32f450i_eval/doc/index.rst diff --git a/boards/arm/gd32f450i_eval/gd32f450i_eval-pinctrl.dtsi b/boards/v2/gd/gd32f450i_eval/gd32f450i_eval-pinctrl.dtsi similarity index 100% rename from boards/arm/gd32f450i_eval/gd32f450i_eval-pinctrl.dtsi rename to boards/v2/gd/gd32f450i_eval/gd32f450i_eval-pinctrl.dtsi diff --git a/boards/arm/gd32f450i_eval/gd32f450i_eval.dts b/boards/v2/gd/gd32f450i_eval/gd32f450i_eval.dts similarity index 100% rename from boards/arm/gd32f450i_eval/gd32f450i_eval.dts rename to boards/v2/gd/gd32f450i_eval/gd32f450i_eval.dts diff --git a/boards/arm/gd32f450i_eval/gd32f450i_eval.yaml b/boards/v2/gd/gd32f450i_eval/gd32f450i_eval.yaml similarity index 100% rename from boards/arm/gd32f450i_eval/gd32f450i_eval.yaml rename to boards/v2/gd/gd32f450i_eval/gd32f450i_eval.yaml diff --git a/boards/arm/gd32f450i_eval/gd32f450i_eval_defconfig b/boards/v2/gd/gd32f450i_eval/gd32f450i_eval_defconfig similarity index 71% rename from boards/arm/gd32f450i_eval/gd32f450i_eval_defconfig rename to boards/v2/gd/gd32f450i_eval/gd32f450i_eval_defconfig index 57db7c521eb58a..07ba35284c335b 100644 --- a/boards/arm/gd32f450i_eval/gd32f450i_eval_defconfig +++ b/boards/v2/gd/gd32f450i_eval/gd32f450i_eval_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2021, Teslabs Engineering S.L. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32F4XX=y -CONFIG_SOC_GD32F450=y -CONFIG_BOARD_GD32F450I_EVAL=y - CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y diff --git a/boards/arm/gd32f450i_eval/support/openocd.cfg b/boards/v2/gd/gd32f450i_eval/support/openocd.cfg similarity index 100% rename from boards/arm/gd32f450i_eval/support/openocd.cfg rename to boards/v2/gd/gd32f450i_eval/support/openocd.cfg From ef384ef914eb4066967af376b5b1418510ba9629 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 2 Jan 2024 17:46:43 +0100 Subject: [PATCH 03/18] boards: gd32a503v_eval: convert to HWMv2 Convert the board to HWMv2. Signed-off-by: Gerard Marull-Paretas --- boards/arm/gd32a503v_eval/Kconfig.board | 6 ------ boards/arm/gd32a503v_eval/Kconfig.defconfig | 9 --------- boards/v2/gd/gd32a503v_eval/Kconfig.gd32a503v_eval | 5 +++++ boards/{arm => v2/gd}/gd32a503v_eval/board.cmake | 0 boards/v2/gd/gd32a503v_eval/board.yml | 5 +++++ .../gd}/gd32a503v_eval/doc/img/gd32a503v_eval.jpg | Bin boards/{arm => v2/gd}/gd32a503v_eval/doc/index.rst | 0 .../gd}/gd32a503v_eval/gd32a503v_eval-pinctrl.dtsi | 0 .../gd}/gd32a503v_eval/gd32a503v_eval.dts | 0 .../gd}/gd32a503v_eval/gd32a503v_eval.yaml | 0 .../gd}/gd32a503v_eval/gd32a503v_eval_defconfig | 4 ---- 11 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 boards/arm/gd32a503v_eval/Kconfig.board delete mode 100644 boards/arm/gd32a503v_eval/Kconfig.defconfig create mode 100644 boards/v2/gd/gd32a503v_eval/Kconfig.gd32a503v_eval rename boards/{arm => v2/gd}/gd32a503v_eval/board.cmake (100%) create mode 100644 boards/v2/gd/gd32a503v_eval/board.yml rename boards/{arm => v2/gd}/gd32a503v_eval/doc/img/gd32a503v_eval.jpg (100%) rename boards/{arm => v2/gd}/gd32a503v_eval/doc/index.rst (100%) rename boards/{arm => v2/gd}/gd32a503v_eval/gd32a503v_eval-pinctrl.dtsi (100%) rename boards/{arm => v2/gd}/gd32a503v_eval/gd32a503v_eval.dts (100%) rename boards/{arm => v2/gd}/gd32a503v_eval/gd32a503v_eval.yaml (100%) rename boards/{arm => v2/gd}/gd32a503v_eval/gd32a503v_eval_defconfig (72%) diff --git a/boards/arm/gd32a503v_eval/Kconfig.board b/boards/arm/gd32a503v_eval/Kconfig.board deleted file mode 100644 index 827b0b4dcb818c..00000000000000 --- a/boards/arm/gd32a503v_eval/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022 YuLong Yao -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32A503V_EVAL - bool "GigaDevice GD32A503V-EVAL" - depends on SOC_GD32A503 diff --git a/boards/arm/gd32a503v_eval/Kconfig.defconfig b/boards/arm/gd32a503v_eval/Kconfig.defconfig deleted file mode 100644 index 7c0c1ad2b7002b..00000000000000 --- a/boards/arm/gd32a503v_eval/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022 YuLong Yao -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32A503V_EVAL - -config BOARD - default "gd32a503v_eval" - -endif # BOARD_GD32A503V_EVAL diff --git a/boards/v2/gd/gd32a503v_eval/Kconfig.gd32a503v_eval b/boards/v2/gd/gd32a503v_eval/Kconfig.gd32a503v_eval new file mode 100644 index 00000000000000..c1e49432cb6d5f --- /dev/null +++ b/boards/v2/gd/gd32a503v_eval/Kconfig.gd32a503v_eval @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32A503V_EVAL + select SOC_GD32A503 diff --git a/boards/arm/gd32a503v_eval/board.cmake b/boards/v2/gd/gd32a503v_eval/board.cmake similarity index 100% rename from boards/arm/gd32a503v_eval/board.cmake rename to boards/v2/gd/gd32a503v_eval/board.cmake diff --git a/boards/v2/gd/gd32a503v_eval/board.yml b/boards/v2/gd/gd32a503v_eval/board.yml new file mode 100644 index 00000000000000..8b0d35fd79d6e8 --- /dev/null +++ b/boards/v2/gd/gd32a503v_eval/board.yml @@ -0,0 +1,5 @@ +board: + name: gd32a503v_eval + vendor: GigaDevice Semiconductor + socs: + - name: gd32a503 diff --git a/boards/arm/gd32a503v_eval/doc/img/gd32a503v_eval.jpg b/boards/v2/gd/gd32a503v_eval/doc/img/gd32a503v_eval.jpg similarity index 100% rename from boards/arm/gd32a503v_eval/doc/img/gd32a503v_eval.jpg rename to boards/v2/gd/gd32a503v_eval/doc/img/gd32a503v_eval.jpg diff --git a/boards/arm/gd32a503v_eval/doc/index.rst b/boards/v2/gd/gd32a503v_eval/doc/index.rst similarity index 100% rename from boards/arm/gd32a503v_eval/doc/index.rst rename to boards/v2/gd/gd32a503v_eval/doc/index.rst diff --git a/boards/arm/gd32a503v_eval/gd32a503v_eval-pinctrl.dtsi b/boards/v2/gd/gd32a503v_eval/gd32a503v_eval-pinctrl.dtsi similarity index 100% rename from boards/arm/gd32a503v_eval/gd32a503v_eval-pinctrl.dtsi rename to boards/v2/gd/gd32a503v_eval/gd32a503v_eval-pinctrl.dtsi diff --git a/boards/arm/gd32a503v_eval/gd32a503v_eval.dts b/boards/v2/gd/gd32a503v_eval/gd32a503v_eval.dts similarity index 100% rename from boards/arm/gd32a503v_eval/gd32a503v_eval.dts rename to boards/v2/gd/gd32a503v_eval/gd32a503v_eval.dts diff --git a/boards/arm/gd32a503v_eval/gd32a503v_eval.yaml b/boards/v2/gd/gd32a503v_eval/gd32a503v_eval.yaml similarity index 100% rename from boards/arm/gd32a503v_eval/gd32a503v_eval.yaml rename to boards/v2/gd/gd32a503v_eval/gd32a503v_eval.yaml diff --git a/boards/arm/gd32a503v_eval/gd32a503v_eval_defconfig b/boards/v2/gd/gd32a503v_eval/gd32a503v_eval_defconfig similarity index 72% rename from boards/arm/gd32a503v_eval/gd32a503v_eval_defconfig rename to boards/v2/gd/gd32a503v_eval/gd32a503v_eval_defconfig index dfcc85ee1e1b83..5d4c4159b6c097 100644 --- a/boards/arm/gd32a503v_eval/gd32a503v_eval_defconfig +++ b/boards/v2/gd/gd32a503v_eval/gd32a503v_eval_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2022 YuLong Yao # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32A50X=y -CONFIG_SOC_GD32A503=y -CONFIG_BOARD_GD32A503V_EVAL=y - CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y From 4f6b59d44b8d68a87ac7b4c3cc1447b4ec7d18d9 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 2 Jan 2024 17:48:04 +0100 Subject: [PATCH 04/18] boards: gd32e103v_eval: convert to HWMv2 Convert the board to HWMv2. Signed-off-by: Gerard Marull-Paretas --- boards/arm/gd32e103v_eval/Kconfig.board | 6 ------ boards/arm/gd32e103v_eval/Kconfig.defconfig | 9 --------- boards/v2/gd/gd32e103v_eval/Kconfig.gd32e103v_eval | 5 +++++ boards/{arm => v2/gd}/gd32e103v_eval/board.cmake | 0 boards/v2/gd/gd32e103v_eval/board.yml | 5 +++++ .../gd}/gd32e103v_eval/doc/img/gd32e103v_eval.jpg | Bin boards/{arm => v2/gd}/gd32e103v_eval/doc/index.rst | 0 .../gd}/gd32e103v_eval/gd32e103v_eval-pinctrl.dtsi | 0 .../gd}/gd32e103v_eval/gd32e103v_eval.dts | 0 .../gd}/gd32e103v_eval/gd32e103v_eval.yaml | 0 .../gd}/gd32e103v_eval/gd32e103v_eval_defconfig | 4 ---- .../gd}/gd32e103v_eval/support/openocd.cfg | 0 12 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 boards/arm/gd32e103v_eval/Kconfig.board delete mode 100644 boards/arm/gd32e103v_eval/Kconfig.defconfig create mode 100644 boards/v2/gd/gd32e103v_eval/Kconfig.gd32e103v_eval rename boards/{arm => v2/gd}/gd32e103v_eval/board.cmake (100%) create mode 100644 boards/v2/gd/gd32e103v_eval/board.yml rename boards/{arm => v2/gd}/gd32e103v_eval/doc/img/gd32e103v_eval.jpg (100%) rename boards/{arm => v2/gd}/gd32e103v_eval/doc/index.rst (100%) rename boards/{arm => v2/gd}/gd32e103v_eval/gd32e103v_eval-pinctrl.dtsi (100%) rename boards/{arm => v2/gd}/gd32e103v_eval/gd32e103v_eval.dts (100%) rename boards/{arm => v2/gd}/gd32e103v_eval/gd32e103v_eval.yaml (100%) rename boards/{arm => v2/gd}/gd32e103v_eval/gd32e103v_eval_defconfig (68%) rename boards/{arm => v2/gd}/gd32e103v_eval/support/openocd.cfg (100%) diff --git a/boards/arm/gd32e103v_eval/Kconfig.board b/boards/arm/gd32e103v_eval/Kconfig.board deleted file mode 100644 index 848f4d82a6a363..00000000000000 --- a/boards/arm/gd32e103v_eval/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021, YuLong Yao -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32E103V_EVAL - bool "GigaDevice GD32E103V Evaluation Kit" - depends on SOC_GD32E103 diff --git a/boards/arm/gd32e103v_eval/Kconfig.defconfig b/boards/arm/gd32e103v_eval/Kconfig.defconfig deleted file mode 100644 index 4681d2b2464a5d..00000000000000 --- a/boards/arm/gd32e103v_eval/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2021 YuLong Yao -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32E103V_EVAL - -config BOARD - default "gd32e103v_eval" - -endif # BOARD_GD32E103V_EVAL diff --git a/boards/v2/gd/gd32e103v_eval/Kconfig.gd32e103v_eval b/boards/v2/gd/gd32e103v_eval/Kconfig.gd32e103v_eval new file mode 100644 index 00000000000000..f4fb38d69e5c6c --- /dev/null +++ b/boards/v2/gd/gd32e103v_eval/Kconfig.gd32e103v_eval @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32E103V_EVAL + select SOC_GD32E103 diff --git a/boards/arm/gd32e103v_eval/board.cmake b/boards/v2/gd/gd32e103v_eval/board.cmake similarity index 100% rename from boards/arm/gd32e103v_eval/board.cmake rename to boards/v2/gd/gd32e103v_eval/board.cmake diff --git a/boards/v2/gd/gd32e103v_eval/board.yml b/boards/v2/gd/gd32e103v_eval/board.yml new file mode 100644 index 00000000000000..5f4a4200c53fcb --- /dev/null +++ b/boards/v2/gd/gd32e103v_eval/board.yml @@ -0,0 +1,5 @@ +board: + name: gd32e103v_eval + vendor: GigaDevice Semiconductor + socs: + - name: gd32e103 diff --git a/boards/arm/gd32e103v_eval/doc/img/gd32e103v_eval.jpg b/boards/v2/gd/gd32e103v_eval/doc/img/gd32e103v_eval.jpg similarity index 100% rename from boards/arm/gd32e103v_eval/doc/img/gd32e103v_eval.jpg rename to boards/v2/gd/gd32e103v_eval/doc/img/gd32e103v_eval.jpg diff --git a/boards/arm/gd32e103v_eval/doc/index.rst b/boards/v2/gd/gd32e103v_eval/doc/index.rst similarity index 100% rename from boards/arm/gd32e103v_eval/doc/index.rst rename to boards/v2/gd/gd32e103v_eval/doc/index.rst diff --git a/boards/arm/gd32e103v_eval/gd32e103v_eval-pinctrl.dtsi b/boards/v2/gd/gd32e103v_eval/gd32e103v_eval-pinctrl.dtsi similarity index 100% rename from boards/arm/gd32e103v_eval/gd32e103v_eval-pinctrl.dtsi rename to boards/v2/gd/gd32e103v_eval/gd32e103v_eval-pinctrl.dtsi diff --git a/boards/arm/gd32e103v_eval/gd32e103v_eval.dts b/boards/v2/gd/gd32e103v_eval/gd32e103v_eval.dts similarity index 100% rename from boards/arm/gd32e103v_eval/gd32e103v_eval.dts rename to boards/v2/gd/gd32e103v_eval/gd32e103v_eval.dts diff --git a/boards/arm/gd32e103v_eval/gd32e103v_eval.yaml b/boards/v2/gd/gd32e103v_eval/gd32e103v_eval.yaml similarity index 100% rename from boards/arm/gd32e103v_eval/gd32e103v_eval.yaml rename to boards/v2/gd/gd32e103v_eval/gd32e103v_eval.yaml diff --git a/boards/arm/gd32e103v_eval/gd32e103v_eval_defconfig b/boards/v2/gd/gd32e103v_eval/gd32e103v_eval_defconfig similarity index 68% rename from boards/arm/gd32e103v_eval/gd32e103v_eval_defconfig rename to boards/v2/gd/gd32e103v_eval/gd32e103v_eval_defconfig index 6af9eba773fc3f..35ac235333c743 100644 --- a/boards/arm/gd32e103v_eval/gd32e103v_eval_defconfig +++ b/boards/v2/gd/gd32e103v_eval/gd32e103v_eval_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2021, YuLong Yao # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32E10X=y -CONFIG_SOC_GD32E103=y -CONFIG_BOARD_GD32E103V_EVAL=y - CONFIG_GD32_HXTAL_8MHZ=y CONFIG_CONSOLE=y diff --git a/boards/arm/gd32e103v_eval/support/openocd.cfg b/boards/v2/gd/gd32e103v_eval/support/openocd.cfg similarity index 100% rename from boards/arm/gd32e103v_eval/support/openocd.cfg rename to boards/v2/gd/gd32e103v_eval/support/openocd.cfg From 5d11b4e8a542b1c9d7396c13861ef86fd3e74f7b Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 2 Jan 2024 17:49:09 +0100 Subject: [PATCH 05/18] boards: gd32e507v_start: convert to HWMv2 Convert the board to HWMv2. Signed-off-by: Gerard Marull-Paretas --- boards/arm/gd32e507v_start/Kconfig.board | 6 ------ boards/arm/gd32e507v_start/Kconfig.defconfig | 9 --------- .../v2/gd/gd32e507v_start/Kconfig.gd32e507v_start | 5 +++++ boards/{arm => v2/gd}/gd32e507v_start/board.cmake | 0 boards/v2/gd/gd32e507v_start/board.yml | 5 +++++ .../gd}/gd32e507v_start/doc/img/gd32e507v_start.jpg | Bin boards/{arm => v2/gd}/gd32e507v_start/doc/index.rst | 0 .../gd32e507v_start/gd32e507v_start-pinctrl.dtsi | 0 .../gd}/gd32e507v_start/gd32e507v_start.dts | 0 .../gd}/gd32e507v_start/gd32e507v_start.yaml | 0 .../gd}/gd32e507v_start/gd32e507v_start_defconfig | 4 ---- 11 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 boards/arm/gd32e507v_start/Kconfig.board delete mode 100644 boards/arm/gd32e507v_start/Kconfig.defconfig create mode 100644 boards/v2/gd/gd32e507v_start/Kconfig.gd32e507v_start rename boards/{arm => v2/gd}/gd32e507v_start/board.cmake (100%) create mode 100644 boards/v2/gd/gd32e507v_start/board.yml rename boards/{arm => v2/gd}/gd32e507v_start/doc/img/gd32e507v_start.jpg (100%) rename boards/{arm => v2/gd}/gd32e507v_start/doc/index.rst (100%) rename boards/{arm => v2/gd}/gd32e507v_start/gd32e507v_start-pinctrl.dtsi (100%) rename boards/{arm => v2/gd}/gd32e507v_start/gd32e507v_start.dts (100%) rename boards/{arm => v2/gd}/gd32e507v_start/gd32e507v_start.yaml (100%) rename boards/{arm => v2/gd}/gd32e507v_start/gd32e507v_start_defconfig (70%) diff --git a/boards/arm/gd32e507v_start/Kconfig.board b/boards/arm/gd32e507v_start/Kconfig.board deleted file mode 100644 index 427e3c414acdb3..00000000000000 --- a/boards/arm/gd32e507v_start/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022, Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32E507V_START - bool "GigaDevice GD32E507V-START" - depends on SOC_GD32E507 diff --git a/boards/arm/gd32e507v_start/Kconfig.defconfig b/boards/arm/gd32e507v_start/Kconfig.defconfig deleted file mode 100644 index c5ca16fd25be6c..00000000000000 --- a/boards/arm/gd32e507v_start/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022 Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32E507V_START - -config BOARD - default "gd32e507v_start" - -endif # BOARD_GD32E507V_START diff --git a/boards/v2/gd/gd32e507v_start/Kconfig.gd32e507v_start b/boards/v2/gd/gd32e507v_start/Kconfig.gd32e507v_start new file mode 100644 index 00000000000000..be09310ad58f32 --- /dev/null +++ b/boards/v2/gd/gd32e507v_start/Kconfig.gd32e507v_start @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32E507V_START + select SOC_GD32E507 diff --git a/boards/arm/gd32e507v_start/board.cmake b/boards/v2/gd/gd32e507v_start/board.cmake similarity index 100% rename from boards/arm/gd32e507v_start/board.cmake rename to boards/v2/gd/gd32e507v_start/board.cmake diff --git a/boards/v2/gd/gd32e507v_start/board.yml b/boards/v2/gd/gd32e507v_start/board.yml new file mode 100644 index 00000000000000..8d587e4f332d2b --- /dev/null +++ b/boards/v2/gd/gd32e507v_start/board.yml @@ -0,0 +1,5 @@ +board: + name: gd32e507v_start + vendor: GigaDevice Semiconductor + socs: + - name: gd32e507 diff --git a/boards/arm/gd32e507v_start/doc/img/gd32e507v_start.jpg b/boards/v2/gd/gd32e507v_start/doc/img/gd32e507v_start.jpg similarity index 100% rename from boards/arm/gd32e507v_start/doc/img/gd32e507v_start.jpg rename to boards/v2/gd/gd32e507v_start/doc/img/gd32e507v_start.jpg diff --git a/boards/arm/gd32e507v_start/doc/index.rst b/boards/v2/gd/gd32e507v_start/doc/index.rst similarity index 100% rename from boards/arm/gd32e507v_start/doc/index.rst rename to boards/v2/gd/gd32e507v_start/doc/index.rst diff --git a/boards/arm/gd32e507v_start/gd32e507v_start-pinctrl.dtsi b/boards/v2/gd/gd32e507v_start/gd32e507v_start-pinctrl.dtsi similarity index 100% rename from boards/arm/gd32e507v_start/gd32e507v_start-pinctrl.dtsi rename to boards/v2/gd/gd32e507v_start/gd32e507v_start-pinctrl.dtsi diff --git a/boards/arm/gd32e507v_start/gd32e507v_start.dts b/boards/v2/gd/gd32e507v_start/gd32e507v_start.dts similarity index 100% rename from boards/arm/gd32e507v_start/gd32e507v_start.dts rename to boards/v2/gd/gd32e507v_start/gd32e507v_start.dts diff --git a/boards/arm/gd32e507v_start/gd32e507v_start.yaml b/boards/v2/gd/gd32e507v_start/gd32e507v_start.yaml similarity index 100% rename from boards/arm/gd32e507v_start/gd32e507v_start.yaml rename to boards/v2/gd/gd32e507v_start/gd32e507v_start.yaml diff --git a/boards/arm/gd32e507v_start/gd32e507v_start_defconfig b/boards/v2/gd/gd32e507v_start/gd32e507v_start_defconfig similarity index 70% rename from boards/arm/gd32e507v_start/gd32e507v_start_defconfig rename to boards/v2/gd/gd32e507v_start/gd32e507v_start_defconfig index 581cdd712b1018..51f83a8ccd6624 100644 --- a/boards/arm/gd32e507v_start/gd32e507v_start_defconfig +++ b/boards/v2/gd/gd32e507v_start/gd32e507v_start_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2022, Teslabs Engineering S.L. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32E50X=y -CONFIG_SOC_GD32E507=y -CONFIG_BOARD_GD32E507V_START=y - CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y From 4d32a5e6cb771df81472c3e1ae602a82f870e761 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 2 Jan 2024 17:49:58 +0100 Subject: [PATCH 06/18] boards: gd32e507z_eval: convert to HWMv2 Convert the board to HWMv2. Signed-off-by: Gerard Marull-Paretas --- boards/arm/gd32e507z_eval/Kconfig.board | 6 ------ boards/arm/gd32e507z_eval/Kconfig.defconfig | 9 --------- boards/v2/gd/gd32e507z_eval/Kconfig.gd32e507z_eval | 5 +++++ boards/{arm => v2/gd}/gd32e507z_eval/board.cmake | 0 boards/v2/gd/gd32e507z_eval/board.yml | 5 +++++ .../gd}/gd32e507z_eval/doc/img/gd32e507z_eval.webp | Bin boards/{arm => v2/gd}/gd32e507z_eval/doc/index.rst | 0 .../gd}/gd32e507z_eval/gd32e507z_eval-pinctrl.dtsi | 0 .../gd}/gd32e507z_eval/gd32e507z_eval.dts | 0 .../gd}/gd32e507z_eval/gd32e507z_eval.yaml | 0 .../gd}/gd32e507z_eval/gd32e507z_eval_defconfig | 4 ---- 11 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 boards/arm/gd32e507z_eval/Kconfig.board delete mode 100644 boards/arm/gd32e507z_eval/Kconfig.defconfig create mode 100644 boards/v2/gd/gd32e507z_eval/Kconfig.gd32e507z_eval rename boards/{arm => v2/gd}/gd32e507z_eval/board.cmake (100%) create mode 100644 boards/v2/gd/gd32e507z_eval/board.yml rename boards/{arm => v2/gd}/gd32e507z_eval/doc/img/gd32e507z_eval.webp (100%) rename boards/{arm => v2/gd}/gd32e507z_eval/doc/index.rst (100%) rename boards/{arm => v2/gd}/gd32e507z_eval/gd32e507z_eval-pinctrl.dtsi (100%) rename boards/{arm => v2/gd}/gd32e507z_eval/gd32e507z_eval.dts (100%) rename boards/{arm => v2/gd}/gd32e507z_eval/gd32e507z_eval.yaml (100%) rename boards/{arm => v2/gd}/gd32e507z_eval/gd32e507z_eval_defconfig (71%) diff --git a/boards/arm/gd32e507z_eval/Kconfig.board b/boards/arm/gd32e507z_eval/Kconfig.board deleted file mode 100644 index 0b9208ff8b7913..00000000000000 --- a/boards/arm/gd32e507z_eval/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022, Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32E507Z_EVAL - bool "GigaDevice GD32E507Z-EVAL" - depends on SOC_GD32E507 diff --git a/boards/arm/gd32e507z_eval/Kconfig.defconfig b/boards/arm/gd32e507z_eval/Kconfig.defconfig deleted file mode 100644 index 39e067ed59eead..00000000000000 --- a/boards/arm/gd32e507z_eval/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022 Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32E507Z_EVAL - -config BOARD - default "gd32e507z_eval" - -endif # BOARD_GD32E507Z_EVAL diff --git a/boards/v2/gd/gd32e507z_eval/Kconfig.gd32e507z_eval b/boards/v2/gd/gd32e507z_eval/Kconfig.gd32e507z_eval new file mode 100644 index 00000000000000..bd40810385cfbc --- /dev/null +++ b/boards/v2/gd/gd32e507z_eval/Kconfig.gd32e507z_eval @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32E507Z_EVAL + select SOC_GD32E507 diff --git a/boards/arm/gd32e507z_eval/board.cmake b/boards/v2/gd/gd32e507z_eval/board.cmake similarity index 100% rename from boards/arm/gd32e507z_eval/board.cmake rename to boards/v2/gd/gd32e507z_eval/board.cmake diff --git a/boards/v2/gd/gd32e507z_eval/board.yml b/boards/v2/gd/gd32e507z_eval/board.yml new file mode 100644 index 00000000000000..6dde5e7a16919a --- /dev/null +++ b/boards/v2/gd/gd32e507z_eval/board.yml @@ -0,0 +1,5 @@ +board: + name: gd32e507z_eval + vendor: GigaDevice Semiconductor + socs: + - name: gd32e507 diff --git a/boards/arm/gd32e507z_eval/doc/img/gd32e507z_eval.webp b/boards/v2/gd/gd32e507z_eval/doc/img/gd32e507z_eval.webp similarity index 100% rename from boards/arm/gd32e507z_eval/doc/img/gd32e507z_eval.webp rename to boards/v2/gd/gd32e507z_eval/doc/img/gd32e507z_eval.webp diff --git a/boards/arm/gd32e507z_eval/doc/index.rst b/boards/v2/gd/gd32e507z_eval/doc/index.rst similarity index 100% rename from boards/arm/gd32e507z_eval/doc/index.rst rename to boards/v2/gd/gd32e507z_eval/doc/index.rst diff --git a/boards/arm/gd32e507z_eval/gd32e507z_eval-pinctrl.dtsi b/boards/v2/gd/gd32e507z_eval/gd32e507z_eval-pinctrl.dtsi similarity index 100% rename from boards/arm/gd32e507z_eval/gd32e507z_eval-pinctrl.dtsi rename to boards/v2/gd/gd32e507z_eval/gd32e507z_eval-pinctrl.dtsi diff --git a/boards/arm/gd32e507z_eval/gd32e507z_eval.dts b/boards/v2/gd/gd32e507z_eval/gd32e507z_eval.dts similarity index 100% rename from boards/arm/gd32e507z_eval/gd32e507z_eval.dts rename to boards/v2/gd/gd32e507z_eval/gd32e507z_eval.dts diff --git a/boards/arm/gd32e507z_eval/gd32e507z_eval.yaml b/boards/v2/gd/gd32e507z_eval/gd32e507z_eval.yaml similarity index 100% rename from boards/arm/gd32e507z_eval/gd32e507z_eval.yaml rename to boards/v2/gd/gd32e507z_eval/gd32e507z_eval.yaml diff --git a/boards/arm/gd32e507z_eval/gd32e507z_eval_defconfig b/boards/v2/gd/gd32e507z_eval/gd32e507z_eval_defconfig similarity index 71% rename from boards/arm/gd32e507z_eval/gd32e507z_eval_defconfig rename to boards/v2/gd/gd32e507z_eval/gd32e507z_eval_defconfig index c6b1f6ad32ca3a..51f83a8ccd6624 100644 --- a/boards/arm/gd32e507z_eval/gd32e507z_eval_defconfig +++ b/boards/v2/gd/gd32e507z_eval/gd32e507z_eval_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2022, Teslabs Engineering S.L. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32E50X=y -CONFIG_SOC_GD32E507=y -CONFIG_BOARD_GD32E507Z_EVAL=y - CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y From 2fa150d219008351e9f40d2b2d205e9de223891b Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 2 Jan 2024 17:50:50 +0100 Subject: [PATCH 07/18] boards: gd32f350r_eval: convert to HWMv2 Convert the board to HWMv2. Signed-off-by: Gerard Marull-Paretas --- boards/arm/gd32f350r_eval/Kconfig.board | 6 ------ boards/arm/gd32f350r_eval/Kconfig.defconfig | 9 --------- boards/v2/gd/gd32f350r_eval/Kconfig.gd32f350r_eval | 5 +++++ boards/{arm => v2/gd}/gd32f350r_eval/board.cmake | 0 boards/v2/gd/gd32f350r_eval/board.yml | 5 +++++ .../gd}/gd32f350r_eval/doc/img/gd32f350r_eval.webp | Bin boards/{arm => v2/gd}/gd32f350r_eval/doc/index.rst | 0 .../gd}/gd32f350r_eval/gd32f350r_eval-pinctrl.dtsi | 0 .../gd}/gd32f350r_eval/gd32f350r_eval.dts | 0 .../gd}/gd32f350r_eval/gd32f350r_eval.yaml | 0 .../gd}/gd32f350r_eval/gd32f350r_eval_defconfig | 5 ----- .../gd}/gd32f350r_eval/support/openocd.cfg | 0 12 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 boards/arm/gd32f350r_eval/Kconfig.board delete mode 100644 boards/arm/gd32f350r_eval/Kconfig.defconfig create mode 100644 boards/v2/gd/gd32f350r_eval/Kconfig.gd32f350r_eval rename boards/{arm => v2/gd}/gd32f350r_eval/board.cmake (100%) create mode 100644 boards/v2/gd/gd32f350r_eval/board.yml rename boards/{arm => v2/gd}/gd32f350r_eval/doc/img/gd32f350r_eval.webp (100%) rename boards/{arm => v2/gd}/gd32f350r_eval/doc/index.rst (100%) rename boards/{arm => v2/gd}/gd32f350r_eval/gd32f350r_eval-pinctrl.dtsi (100%) rename boards/{arm => v2/gd}/gd32f350r_eval/gd32f350r_eval.dts (100%) rename boards/{arm => v2/gd}/gd32f350r_eval/gd32f350r_eval.yaml (100%) rename boards/{arm => v2/gd}/gd32f350r_eval/gd32f350r_eval_defconfig (60%) rename boards/{arm => v2/gd}/gd32f350r_eval/support/openocd.cfg (100%) diff --git a/boards/arm/gd32f350r_eval/Kconfig.board b/boards/arm/gd32f350r_eval/Kconfig.board deleted file mode 100644 index b4fbc6635f7c80..00000000000000 --- a/boards/arm/gd32f350r_eval/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021 BrainCo Inc. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32F350R_EVAL - bool "GigaDevice GD32F350R Evaluation Kit" - depends on SOC_GD32F350 diff --git a/boards/arm/gd32f350r_eval/Kconfig.defconfig b/boards/arm/gd32f350r_eval/Kconfig.defconfig deleted file mode 100644 index 1de5675fb9cd13..00000000000000 --- a/boards/arm/gd32f350r_eval/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2021 BrainCo Inc. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32F350R_EVAL - -config BOARD - default "gd32f350r_eval" - -endif # BOARD_GD32F350R_EVAL diff --git a/boards/v2/gd/gd32f350r_eval/Kconfig.gd32f350r_eval b/boards/v2/gd/gd32f350r_eval/Kconfig.gd32f350r_eval new file mode 100644 index 00000000000000..ae610061d8d635 --- /dev/null +++ b/boards/v2/gd/gd32f350r_eval/Kconfig.gd32f350r_eval @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32F350R_EVAL + select SOC_GD32F350 diff --git a/boards/arm/gd32f350r_eval/board.cmake b/boards/v2/gd/gd32f350r_eval/board.cmake similarity index 100% rename from boards/arm/gd32f350r_eval/board.cmake rename to boards/v2/gd/gd32f350r_eval/board.cmake diff --git a/boards/v2/gd/gd32f350r_eval/board.yml b/boards/v2/gd/gd32f350r_eval/board.yml new file mode 100644 index 00000000000000..e63a7a20ec94f6 --- /dev/null +++ b/boards/v2/gd/gd32f350r_eval/board.yml @@ -0,0 +1,5 @@ +board: + name: gd32f350r_eval + vendor: GigaDevice Semiconductor + socs: + - name: gd32f350 diff --git a/boards/arm/gd32f350r_eval/doc/img/gd32f350r_eval.webp b/boards/v2/gd/gd32f350r_eval/doc/img/gd32f350r_eval.webp similarity index 100% rename from boards/arm/gd32f350r_eval/doc/img/gd32f350r_eval.webp rename to boards/v2/gd/gd32f350r_eval/doc/img/gd32f350r_eval.webp diff --git a/boards/arm/gd32f350r_eval/doc/index.rst b/boards/v2/gd/gd32f350r_eval/doc/index.rst similarity index 100% rename from boards/arm/gd32f350r_eval/doc/index.rst rename to boards/v2/gd/gd32f350r_eval/doc/index.rst diff --git a/boards/arm/gd32f350r_eval/gd32f350r_eval-pinctrl.dtsi b/boards/v2/gd/gd32f350r_eval/gd32f350r_eval-pinctrl.dtsi similarity index 100% rename from boards/arm/gd32f350r_eval/gd32f350r_eval-pinctrl.dtsi rename to boards/v2/gd/gd32f350r_eval/gd32f350r_eval-pinctrl.dtsi diff --git a/boards/arm/gd32f350r_eval/gd32f350r_eval.dts b/boards/v2/gd/gd32f350r_eval/gd32f350r_eval.dts similarity index 100% rename from boards/arm/gd32f350r_eval/gd32f350r_eval.dts rename to boards/v2/gd/gd32f350r_eval/gd32f350r_eval.dts diff --git a/boards/arm/gd32f350r_eval/gd32f350r_eval.yaml b/boards/v2/gd/gd32f350r_eval/gd32f350r_eval.yaml similarity index 100% rename from boards/arm/gd32f350r_eval/gd32f350r_eval.yaml rename to boards/v2/gd/gd32f350r_eval/gd32f350r_eval.yaml diff --git a/boards/arm/gd32f350r_eval/gd32f350r_eval_defconfig b/boards/v2/gd/gd32f350r_eval/gd32f350r_eval_defconfig similarity index 60% rename from boards/arm/gd32f350r_eval/gd32f350r_eval_defconfig rename to boards/v2/gd/gd32f350r_eval/gd32f350r_eval_defconfig index dfb61c38eb2adb..6df7f7edc24057 100644 --- a/boards/arm/gd32f350r_eval/gd32f350r_eval_defconfig +++ b/boards/v2/gd/gd32f350r_eval/gd32f350r_eval_defconfig @@ -1,11 +1,6 @@ # Copyright (c) 2021 BrainCo Inc. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32F3X0=y -CONFIG_SOC_GD32F350=y -CONFIG_BOARD_GD32F350R_EVAL=y - - CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/arm/gd32f350r_eval/support/openocd.cfg b/boards/v2/gd/gd32f350r_eval/support/openocd.cfg similarity index 100% rename from boards/arm/gd32f350r_eval/support/openocd.cfg rename to boards/v2/gd/gd32f350r_eval/support/openocd.cfg From b18cf8e7064153b5bd18a31cdc3f27ace94000ef Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 2 Jan 2024 17:54:37 +0100 Subject: [PATCH 08/18] boards: gd32f403z_eval: convert to HWMv2 Convert the board to HWMv2. Signed-off-by: Gerard Marull-Paretas --- boards/arm/gd32f403z_eval/Kconfig.board | 6 ------ boards/arm/gd32f403z_eval/Kconfig.defconfig | 9 --------- boards/v2/gd/gd32f403z_eval/Kconfig.gd32f403z_eval | 5 +++++ boards/{arm => v2/gd}/gd32f403z_eval/board.cmake | 0 boards/v2/gd/gd32f403z_eval/board.yml | 5 +++++ .../gd}/gd32f403z_eval/doc/img/gd32f403z_eval.jpg | Bin boards/{arm => v2/gd}/gd32f403z_eval/doc/index.rst | 0 .../gd}/gd32f403z_eval/gd32f403z_eval-pinctrl.dtsi | 0 .../gd}/gd32f403z_eval/gd32f403z_eval.dts | 0 .../gd}/gd32f403z_eval/gd32f403z_eval.yaml | 0 .../gd}/gd32f403z_eval/gd32f403z_eval_defconfig | 4 ---- .../gd}/gd32f403z_eval/support/openocd.cfg | 0 12 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 boards/arm/gd32f403z_eval/Kconfig.board delete mode 100644 boards/arm/gd32f403z_eval/Kconfig.defconfig create mode 100644 boards/v2/gd/gd32f403z_eval/Kconfig.gd32f403z_eval rename boards/{arm => v2/gd}/gd32f403z_eval/board.cmake (100%) create mode 100644 boards/v2/gd/gd32f403z_eval/board.yml rename boards/{arm => v2/gd}/gd32f403z_eval/doc/img/gd32f403z_eval.jpg (100%) rename boards/{arm => v2/gd}/gd32f403z_eval/doc/index.rst (100%) rename boards/{arm => v2/gd}/gd32f403z_eval/gd32f403z_eval-pinctrl.dtsi (100%) rename boards/{arm => v2/gd}/gd32f403z_eval/gd32f403z_eval.dts (100%) rename boards/{arm => v2/gd}/gd32f403z_eval/gd32f403z_eval.yaml (100%) rename boards/{arm => v2/gd}/gd32f403z_eval/gd32f403z_eval_defconfig (70%) rename boards/{arm => v2/gd}/gd32f403z_eval/support/openocd.cfg (100%) diff --git a/boards/arm/gd32f403z_eval/Kconfig.board b/boards/arm/gd32f403z_eval/Kconfig.board deleted file mode 100644 index 97273a13f995a2..00000000000000 --- a/boards/arm/gd32f403z_eval/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2021, ATL Electronics -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32F403Z_EVAL - bool "GigaDevice GD32F403Z Evaluation Kit" - depends on SOC_GD32F403 diff --git a/boards/arm/gd32f403z_eval/Kconfig.defconfig b/boards/arm/gd32f403z_eval/Kconfig.defconfig deleted file mode 100644 index 39f1df8e537649..00000000000000 --- a/boards/arm/gd32f403z_eval/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2021 ATL Electronics -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32F403Z_EVAL - -config BOARD - default "gd32f403z_eval" - -endif # BOARD_GD32F403Z_EVAL diff --git a/boards/v2/gd/gd32f403z_eval/Kconfig.gd32f403z_eval b/boards/v2/gd/gd32f403z_eval/Kconfig.gd32f403z_eval new file mode 100644 index 00000000000000..e9fa7237053827 --- /dev/null +++ b/boards/v2/gd/gd32f403z_eval/Kconfig.gd32f403z_eval @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32F403Z_EVAL + select SOC_GD32F403 diff --git a/boards/arm/gd32f403z_eval/board.cmake b/boards/v2/gd/gd32f403z_eval/board.cmake similarity index 100% rename from boards/arm/gd32f403z_eval/board.cmake rename to boards/v2/gd/gd32f403z_eval/board.cmake diff --git a/boards/v2/gd/gd32f403z_eval/board.yml b/boards/v2/gd/gd32f403z_eval/board.yml new file mode 100644 index 00000000000000..568494713dd031 --- /dev/null +++ b/boards/v2/gd/gd32f403z_eval/board.yml @@ -0,0 +1,5 @@ +board: + name: gd32f403z_eval + vendor: GigaDevice Semiconductor + socs: + - name: gd32f403 diff --git a/boards/arm/gd32f403z_eval/doc/img/gd32f403z_eval.jpg b/boards/v2/gd/gd32f403z_eval/doc/img/gd32f403z_eval.jpg similarity index 100% rename from boards/arm/gd32f403z_eval/doc/img/gd32f403z_eval.jpg rename to boards/v2/gd/gd32f403z_eval/doc/img/gd32f403z_eval.jpg diff --git a/boards/arm/gd32f403z_eval/doc/index.rst b/boards/v2/gd/gd32f403z_eval/doc/index.rst similarity index 100% rename from boards/arm/gd32f403z_eval/doc/index.rst rename to boards/v2/gd/gd32f403z_eval/doc/index.rst diff --git a/boards/arm/gd32f403z_eval/gd32f403z_eval-pinctrl.dtsi b/boards/v2/gd/gd32f403z_eval/gd32f403z_eval-pinctrl.dtsi similarity index 100% rename from boards/arm/gd32f403z_eval/gd32f403z_eval-pinctrl.dtsi rename to boards/v2/gd/gd32f403z_eval/gd32f403z_eval-pinctrl.dtsi diff --git a/boards/arm/gd32f403z_eval/gd32f403z_eval.dts b/boards/v2/gd/gd32f403z_eval/gd32f403z_eval.dts similarity index 100% rename from boards/arm/gd32f403z_eval/gd32f403z_eval.dts rename to boards/v2/gd/gd32f403z_eval/gd32f403z_eval.dts diff --git a/boards/arm/gd32f403z_eval/gd32f403z_eval.yaml b/boards/v2/gd/gd32f403z_eval/gd32f403z_eval.yaml similarity index 100% rename from boards/arm/gd32f403z_eval/gd32f403z_eval.yaml rename to boards/v2/gd/gd32f403z_eval/gd32f403z_eval.yaml diff --git a/boards/arm/gd32f403z_eval/gd32f403z_eval_defconfig b/boards/v2/gd/gd32f403z_eval/gd32f403z_eval_defconfig similarity index 70% rename from boards/arm/gd32f403z_eval/gd32f403z_eval_defconfig rename to boards/v2/gd/gd32f403z_eval/gd32f403z_eval_defconfig index 759c53a00ad67e..1c7051a83fb4ff 100644 --- a/boards/arm/gd32f403z_eval/gd32f403z_eval_defconfig +++ b/boards/v2/gd/gd32f403z_eval/gd32f403z_eval_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2021, ATL Electronics # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32F403=y -CONFIG_SOC_GD32F403=y -CONFIG_BOARD_GD32F403Z_EVAL=y - CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y diff --git a/boards/arm/gd32f403z_eval/support/openocd.cfg b/boards/v2/gd/gd32f403z_eval/support/openocd.cfg similarity index 100% rename from boards/arm/gd32f403z_eval/support/openocd.cfg rename to boards/v2/gd/gd32f403z_eval/support/openocd.cfg From cf216bcaf4ed74ea5c0e81e8430901ff31bca09e Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 2 Jan 2024 17:56:29 +0100 Subject: [PATCH 09/18] boards: gd32f407v_start: convert to HWMv2 Convert the board to HWMv2. Signed-off-by: Gerard Marull-Paretas --- boards/arm/gd32f407v_start/Kconfig.board | 6 ------ boards/arm/gd32f407v_start/Kconfig.defconfig | 9 --------- .../v2/gd/gd32f407v_start/Kconfig.gd32f407v_start | 5 +++++ boards/{arm => v2/gd}/gd32f407v_start/board.cmake | 0 boards/v2/gd/gd32f407v_start/board.yml | 5 +++++ .../gd32f407v_start/doc/img/gd32f407v_start.webp | Bin boards/{arm => v2/gd}/gd32f407v_start/doc/index.rst | 0 .../gd32f407v_start/gd32f407v_start-pinctrl.dtsi | 0 .../gd}/gd32f407v_start/gd32f407v_start.dts | 0 .../gd}/gd32f407v_start/gd32f407v_start.yaml | 0 .../gd}/gd32f407v_start/gd32f407v_start_defconfig | 4 ---- 11 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 boards/arm/gd32f407v_start/Kconfig.board delete mode 100644 boards/arm/gd32f407v_start/Kconfig.defconfig create mode 100644 boards/v2/gd/gd32f407v_start/Kconfig.gd32f407v_start rename boards/{arm => v2/gd}/gd32f407v_start/board.cmake (100%) create mode 100644 boards/v2/gd/gd32f407v_start/board.yml rename boards/{arm => v2/gd}/gd32f407v_start/doc/img/gd32f407v_start.webp (100%) rename boards/{arm => v2/gd}/gd32f407v_start/doc/index.rst (100%) rename boards/{arm => v2/gd}/gd32f407v_start/gd32f407v_start-pinctrl.dtsi (100%) rename boards/{arm => v2/gd}/gd32f407v_start/gd32f407v_start.dts (100%) rename boards/{arm => v2/gd}/gd32f407v_start/gd32f407v_start.yaml (100%) rename boards/{arm => v2/gd}/gd32f407v_start/gd32f407v_start_defconfig (72%) diff --git a/boards/arm/gd32f407v_start/Kconfig.board b/boards/arm/gd32f407v_start/Kconfig.board deleted file mode 100644 index 541f1642e93129..00000000000000 --- a/boards/arm/gd32f407v_start/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022, TOKITA Hiroshi -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32F407V_START - bool "GigaDevice GD32F407V-START" - depends on SOC_GD32F407 diff --git a/boards/arm/gd32f407v_start/Kconfig.defconfig b/boards/arm/gd32f407v_start/Kconfig.defconfig deleted file mode 100644 index 888179c2f62311..00000000000000 --- a/boards/arm/gd32f407v_start/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022, TOKITA Hiroshi -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32F407V_START - -config BOARD - default "gd32f407v_start" - -endif # BOARD_GD32F407V_START diff --git a/boards/v2/gd/gd32f407v_start/Kconfig.gd32f407v_start b/boards/v2/gd/gd32f407v_start/Kconfig.gd32f407v_start new file mode 100644 index 00000000000000..6624205d86b7a1 --- /dev/null +++ b/boards/v2/gd/gd32f407v_start/Kconfig.gd32f407v_start @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32F407V_START + select SOC_GD32F407 diff --git a/boards/arm/gd32f407v_start/board.cmake b/boards/v2/gd/gd32f407v_start/board.cmake similarity index 100% rename from boards/arm/gd32f407v_start/board.cmake rename to boards/v2/gd/gd32f407v_start/board.cmake diff --git a/boards/v2/gd/gd32f407v_start/board.yml b/boards/v2/gd/gd32f407v_start/board.yml new file mode 100644 index 00000000000000..3beba1b00700f6 --- /dev/null +++ b/boards/v2/gd/gd32f407v_start/board.yml @@ -0,0 +1,5 @@ +board: + name: gd32f407v_start + vendor: GigaDevice Semiconductor + socs: + - name: gd32f407 diff --git a/boards/arm/gd32f407v_start/doc/img/gd32f407v_start.webp b/boards/v2/gd/gd32f407v_start/doc/img/gd32f407v_start.webp similarity index 100% rename from boards/arm/gd32f407v_start/doc/img/gd32f407v_start.webp rename to boards/v2/gd/gd32f407v_start/doc/img/gd32f407v_start.webp diff --git a/boards/arm/gd32f407v_start/doc/index.rst b/boards/v2/gd/gd32f407v_start/doc/index.rst similarity index 100% rename from boards/arm/gd32f407v_start/doc/index.rst rename to boards/v2/gd/gd32f407v_start/doc/index.rst diff --git a/boards/arm/gd32f407v_start/gd32f407v_start-pinctrl.dtsi b/boards/v2/gd/gd32f407v_start/gd32f407v_start-pinctrl.dtsi similarity index 100% rename from boards/arm/gd32f407v_start/gd32f407v_start-pinctrl.dtsi rename to boards/v2/gd/gd32f407v_start/gd32f407v_start-pinctrl.dtsi diff --git a/boards/arm/gd32f407v_start/gd32f407v_start.dts b/boards/v2/gd/gd32f407v_start/gd32f407v_start.dts similarity index 100% rename from boards/arm/gd32f407v_start/gd32f407v_start.dts rename to boards/v2/gd/gd32f407v_start/gd32f407v_start.dts diff --git a/boards/arm/gd32f407v_start/gd32f407v_start.yaml b/boards/v2/gd/gd32f407v_start/gd32f407v_start.yaml similarity index 100% rename from boards/arm/gd32f407v_start/gd32f407v_start.yaml rename to boards/v2/gd/gd32f407v_start/gd32f407v_start.yaml diff --git a/boards/arm/gd32f407v_start/gd32f407v_start_defconfig b/boards/v2/gd/gd32f407v_start/gd32f407v_start_defconfig similarity index 72% rename from boards/arm/gd32f407v_start/gd32f407v_start_defconfig rename to boards/v2/gd/gd32f407v_start/gd32f407v_start_defconfig index 1b9e3ff5e18b79..b037de8dd841a9 100644 --- a/boards/arm/gd32f407v_start/gd32f407v_start_defconfig +++ b/boards/v2/gd/gd32f407v_start/gd32f407v_start_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2022, TOKITA Hiroshi # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32F4XX=y -CONFIG_SOC_GD32F407=y -CONFIG_BOARD_GD32F407V_START=y - CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y From a4684842ea3ab665884cc24930a5cead6a58c972 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 2 Jan 2024 18:00:09 +0100 Subject: [PATCH 10/18] boards: gd32f450v_start: convert to HWMv2 Convert the board to HWMv2. Signed-off-by: Gerard Marull-Paretas --- boards/arm/gd32f450v_start/Kconfig.board | 6 ------ boards/arm/gd32f450v_start/Kconfig.defconfig | 9 --------- .../v2/gd/gd32f450v_start/Kconfig.gd32f450v_start | 5 +++++ boards/{arm => v2/gd}/gd32f450v_start/board.cmake | 0 boards/v2/gd/gd32f450v_start/board.yml | 5 +++++ .../gd32f450v_start/doc/img/gd32f450v_start.webp | Bin boards/{arm => v2/gd}/gd32f450v_start/doc/index.rst | 0 .../gd32f450v_start/gd32f450v_start-pinctrl.dtsi | 0 .../gd}/gd32f450v_start/gd32f450v_start.dts | 0 .../gd}/gd32f450v_start/gd32f450v_start.yaml | 0 .../gd}/gd32f450v_start/gd32f450v_start_defconfig | 4 ---- .../gd}/gd32f450v_start/support/openocd.cfg | 0 12 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 boards/arm/gd32f450v_start/Kconfig.board delete mode 100644 boards/arm/gd32f450v_start/Kconfig.defconfig create mode 100644 boards/v2/gd/gd32f450v_start/Kconfig.gd32f450v_start rename boards/{arm => v2/gd}/gd32f450v_start/board.cmake (100%) create mode 100644 boards/v2/gd/gd32f450v_start/board.yml rename boards/{arm => v2/gd}/gd32f450v_start/doc/img/gd32f450v_start.webp (100%) rename boards/{arm => v2/gd}/gd32f450v_start/doc/index.rst (100%) rename boards/{arm => v2/gd}/gd32f450v_start/gd32f450v_start-pinctrl.dtsi (100%) rename boards/{arm => v2/gd}/gd32f450v_start/gd32f450v_start.dts (100%) rename boards/{arm => v2/gd}/gd32f450v_start/gd32f450v_start.yaml (100%) rename boards/{arm => v2/gd}/gd32f450v_start/gd32f450v_start_defconfig (70%) rename boards/{arm => v2/gd}/gd32f450v_start/support/openocd.cfg (100%) diff --git a/boards/arm/gd32f450v_start/Kconfig.board b/boards/arm/gd32f450v_start/Kconfig.board deleted file mode 100644 index 7bd8cfbab73a89..00000000000000 --- a/boards/arm/gd32f450v_start/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022, Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32F450V_START - bool "GigaDevice GD32F450V-START" - depends on SOC_GD32F450 diff --git a/boards/arm/gd32f450v_start/Kconfig.defconfig b/boards/arm/gd32f450v_start/Kconfig.defconfig deleted file mode 100644 index 3db890ec9d4a51..00000000000000 --- a/boards/arm/gd32f450v_start/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022 Teslabs Engineering S.L. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32F450V_START - -config BOARD - default "gd32f450v_start" - -endif # BOARD_GD32F450V_START diff --git a/boards/v2/gd/gd32f450v_start/Kconfig.gd32f450v_start b/boards/v2/gd/gd32f450v_start/Kconfig.gd32f450v_start new file mode 100644 index 00000000000000..a666d7912652e7 --- /dev/null +++ b/boards/v2/gd/gd32f450v_start/Kconfig.gd32f450v_start @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32F450V_START + select SOC_GD32F450 diff --git a/boards/arm/gd32f450v_start/board.cmake b/boards/v2/gd/gd32f450v_start/board.cmake similarity index 100% rename from boards/arm/gd32f450v_start/board.cmake rename to boards/v2/gd/gd32f450v_start/board.cmake diff --git a/boards/v2/gd/gd32f450v_start/board.yml b/boards/v2/gd/gd32f450v_start/board.yml new file mode 100644 index 00000000000000..56619d9d495767 --- /dev/null +++ b/boards/v2/gd/gd32f450v_start/board.yml @@ -0,0 +1,5 @@ +board: + name: gd32f450v_start + vendor: GigaDevice Semiconductor + socs: + - name: gd32f450 diff --git a/boards/arm/gd32f450v_start/doc/img/gd32f450v_start.webp b/boards/v2/gd/gd32f450v_start/doc/img/gd32f450v_start.webp similarity index 100% rename from boards/arm/gd32f450v_start/doc/img/gd32f450v_start.webp rename to boards/v2/gd/gd32f450v_start/doc/img/gd32f450v_start.webp diff --git a/boards/arm/gd32f450v_start/doc/index.rst b/boards/v2/gd/gd32f450v_start/doc/index.rst similarity index 100% rename from boards/arm/gd32f450v_start/doc/index.rst rename to boards/v2/gd/gd32f450v_start/doc/index.rst diff --git a/boards/arm/gd32f450v_start/gd32f450v_start-pinctrl.dtsi b/boards/v2/gd/gd32f450v_start/gd32f450v_start-pinctrl.dtsi similarity index 100% rename from boards/arm/gd32f450v_start/gd32f450v_start-pinctrl.dtsi rename to boards/v2/gd/gd32f450v_start/gd32f450v_start-pinctrl.dtsi diff --git a/boards/arm/gd32f450v_start/gd32f450v_start.dts b/boards/v2/gd/gd32f450v_start/gd32f450v_start.dts similarity index 100% rename from boards/arm/gd32f450v_start/gd32f450v_start.dts rename to boards/v2/gd/gd32f450v_start/gd32f450v_start.dts diff --git a/boards/arm/gd32f450v_start/gd32f450v_start.yaml b/boards/v2/gd/gd32f450v_start/gd32f450v_start.yaml similarity index 100% rename from boards/arm/gd32f450v_start/gd32f450v_start.yaml rename to boards/v2/gd/gd32f450v_start/gd32f450v_start.yaml diff --git a/boards/arm/gd32f450v_start/gd32f450v_start_defconfig b/boards/v2/gd/gd32f450v_start/gd32f450v_start_defconfig similarity index 70% rename from boards/arm/gd32f450v_start/gd32f450v_start_defconfig rename to boards/v2/gd/gd32f450v_start/gd32f450v_start_defconfig index 0767cf26db1d59..51f83a8ccd6624 100644 --- a/boards/arm/gd32f450v_start/gd32f450v_start_defconfig +++ b/boards/v2/gd/gd32f450v_start/gd32f450v_start_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2022, Teslabs Engineering S.L. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32F4XX=y -CONFIG_SOC_GD32F450=y -CONFIG_BOARD_GD32F450V_START=y - CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y diff --git a/boards/arm/gd32f450v_start/support/openocd.cfg b/boards/v2/gd/gd32f450v_start/support/openocd.cfg similarity index 100% rename from boards/arm/gd32f450v_start/support/openocd.cfg rename to boards/v2/gd/gd32f450v_start/support/openocd.cfg From 74c6e63afaf47d61eef0656257659b1e00f0d2e0 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 2 Jan 2024 18:00:41 +0100 Subject: [PATCH 11/18] boards: gd32f450z_eval: convert to HWMv2 Convert the board to HWMv2. Signed-off-by: Gerard Marull-Paretas --- boards/arm/gd32f450z_eval/Kconfig.board | 6 ------ boards/arm/gd32f450z_eval/Kconfig.defconfig | 9 --------- boards/v2/gd/gd32f450z_eval/Kconfig.gd32f450z_eval | 5 +++++ boards/{arm => v2/gd}/gd32f450z_eval/board.cmake | 0 boards/v2/gd/gd32f450z_eval/board.yml | 5 +++++ .../gd}/gd32f450z_eval/doc/img/gd32f450z_eval.webp | Bin boards/{arm => v2/gd}/gd32f450z_eval/doc/index.rst | 0 .../gd}/gd32f450z_eval/gd32f450z_eval-pinctrl.dtsi | 0 .../gd}/gd32f450z_eval/gd32f450z_eval.dts | 0 .../gd}/gd32f450z_eval/gd32f450z_eval.yaml | 0 .../gd}/gd32f450z_eval/gd32f450z_eval_defconfig | 4 ---- .../gd}/gd32f450z_eval/support/openocd.cfg | 0 12 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 boards/arm/gd32f450z_eval/Kconfig.board delete mode 100644 boards/arm/gd32f450z_eval/Kconfig.defconfig create mode 100644 boards/v2/gd/gd32f450z_eval/Kconfig.gd32f450z_eval rename boards/{arm => v2/gd}/gd32f450z_eval/board.cmake (100%) create mode 100644 boards/v2/gd/gd32f450z_eval/board.yml rename boards/{arm => v2/gd}/gd32f450z_eval/doc/img/gd32f450z_eval.webp (100%) rename boards/{arm => v2/gd}/gd32f450z_eval/doc/index.rst (100%) rename boards/{arm => v2/gd}/gd32f450z_eval/gd32f450z_eval-pinctrl.dtsi (100%) rename boards/{arm => v2/gd}/gd32f450z_eval/gd32f450z_eval.dts (100%) rename boards/{arm => v2/gd}/gd32f450z_eval/gd32f450z_eval.yaml (100%) rename boards/{arm => v2/gd}/gd32f450z_eval/gd32f450z_eval_defconfig (69%) rename boards/{arm => v2/gd}/gd32f450z_eval/support/openocd.cfg (100%) diff --git a/boards/arm/gd32f450z_eval/Kconfig.board b/boards/arm/gd32f450z_eval/Kconfig.board deleted file mode 100644 index 70ced41611024f..00000000000000 --- a/boards/arm/gd32f450z_eval/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022, Rtone. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32F450Z_EVAL - bool "GigaDevice GD32F450Z-EVAL" - depends on SOC_GD32F450 diff --git a/boards/arm/gd32f450z_eval/Kconfig.defconfig b/boards/arm/gd32f450z_eval/Kconfig.defconfig deleted file mode 100644 index 5c2ecc08b517e4..00000000000000 --- a/boards/arm/gd32f450z_eval/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022, Rtone. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32F450Z_EVAL - -config BOARD - default "gd32f450z_eval" - -endif # BOARD_GD32F450Z_EVAL diff --git a/boards/v2/gd/gd32f450z_eval/Kconfig.gd32f450z_eval b/boards/v2/gd/gd32f450z_eval/Kconfig.gd32f450z_eval new file mode 100644 index 00000000000000..3126837aaa2877 --- /dev/null +++ b/boards/v2/gd/gd32f450z_eval/Kconfig.gd32f450z_eval @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32F450Z_EVAL + select SOC_GD32F450 diff --git a/boards/arm/gd32f450z_eval/board.cmake b/boards/v2/gd/gd32f450z_eval/board.cmake similarity index 100% rename from boards/arm/gd32f450z_eval/board.cmake rename to boards/v2/gd/gd32f450z_eval/board.cmake diff --git a/boards/v2/gd/gd32f450z_eval/board.yml b/boards/v2/gd/gd32f450z_eval/board.yml new file mode 100644 index 00000000000000..311ca4639586ec --- /dev/null +++ b/boards/v2/gd/gd32f450z_eval/board.yml @@ -0,0 +1,5 @@ +board: + name: gd32f450z_eval + vendor: GigaDevice Semiconductor + socs: + - name: gd32f450 diff --git a/boards/arm/gd32f450z_eval/doc/img/gd32f450z_eval.webp b/boards/v2/gd/gd32f450z_eval/doc/img/gd32f450z_eval.webp similarity index 100% rename from boards/arm/gd32f450z_eval/doc/img/gd32f450z_eval.webp rename to boards/v2/gd/gd32f450z_eval/doc/img/gd32f450z_eval.webp diff --git a/boards/arm/gd32f450z_eval/doc/index.rst b/boards/v2/gd/gd32f450z_eval/doc/index.rst similarity index 100% rename from boards/arm/gd32f450z_eval/doc/index.rst rename to boards/v2/gd/gd32f450z_eval/doc/index.rst diff --git a/boards/arm/gd32f450z_eval/gd32f450z_eval-pinctrl.dtsi b/boards/v2/gd/gd32f450z_eval/gd32f450z_eval-pinctrl.dtsi similarity index 100% rename from boards/arm/gd32f450z_eval/gd32f450z_eval-pinctrl.dtsi rename to boards/v2/gd/gd32f450z_eval/gd32f450z_eval-pinctrl.dtsi diff --git a/boards/arm/gd32f450z_eval/gd32f450z_eval.dts b/boards/v2/gd/gd32f450z_eval/gd32f450z_eval.dts similarity index 100% rename from boards/arm/gd32f450z_eval/gd32f450z_eval.dts rename to boards/v2/gd/gd32f450z_eval/gd32f450z_eval.dts diff --git a/boards/arm/gd32f450z_eval/gd32f450z_eval.yaml b/boards/v2/gd/gd32f450z_eval/gd32f450z_eval.yaml similarity index 100% rename from boards/arm/gd32f450z_eval/gd32f450z_eval.yaml rename to boards/v2/gd/gd32f450z_eval/gd32f450z_eval.yaml diff --git a/boards/arm/gd32f450z_eval/gd32f450z_eval_defconfig b/boards/v2/gd/gd32f450z_eval/gd32f450z_eval_defconfig similarity index 69% rename from boards/arm/gd32f450z_eval/gd32f450z_eval_defconfig rename to boards/v2/gd/gd32f450z_eval/gd32f450z_eval_defconfig index 59bc8e32ded2f3..4b47334704de17 100644 --- a/boards/arm/gd32f450z_eval/gd32f450z_eval_defconfig +++ b/boards/v2/gd/gd32f450z_eval/gd32f450z_eval_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2022, Rtone. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32F4XX=y -CONFIG_SOC_GD32F450=y -CONFIG_BOARD_GD32F450Z_EVAL=y - CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y diff --git a/boards/arm/gd32f450z_eval/support/openocd.cfg b/boards/v2/gd/gd32f450z_eval/support/openocd.cfg similarity index 100% rename from boards/arm/gd32f450z_eval/support/openocd.cfg rename to boards/v2/gd/gd32f450z_eval/support/openocd.cfg From 680f5e27b0c18c41a7d5286ddd8ef2d34cbe9988 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 2 Jan 2024 18:01:10 +0100 Subject: [PATCH 12/18] boards: gd32f470i_eval: convert to HWMv2 Convert the board to HWMv2. Signed-off-by: Gerard Marull-Paretas --- boards/arm/gd32f470i_eval/Kconfig.board | 6 ------ boards/arm/gd32f470i_eval/Kconfig.defconfig | 9 --------- boards/v2/gd/gd32f470i_eval/Kconfig.gd32f470i_eval | 5 +++++ boards/{arm => v2/gd}/gd32f470i_eval/board.cmake | 0 boards/v2/gd/gd32f470i_eval/board.yml | 5 +++++ .../gd}/gd32f470i_eval/doc/img/gd32f470i_eval.jpg | Bin boards/{arm => v2/gd}/gd32f470i_eval/doc/index.rst | 0 .../gd}/gd32f470i_eval/gd32f470i_eval-pinctrl.dtsi | 0 .../gd}/gd32f470i_eval/gd32f470i_eval.dts | 0 .../gd}/gd32f470i_eval/gd32f470i_eval.yaml | 0 .../gd}/gd32f470i_eval/gd32f470i_eval_defconfig | 4 ---- .../gd}/gd32f470i_eval/support/openocd.cfg | 0 12 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 boards/arm/gd32f470i_eval/Kconfig.board delete mode 100644 boards/arm/gd32f470i_eval/Kconfig.defconfig create mode 100644 boards/v2/gd/gd32f470i_eval/Kconfig.gd32f470i_eval rename boards/{arm => v2/gd}/gd32f470i_eval/board.cmake (100%) create mode 100644 boards/v2/gd/gd32f470i_eval/board.yml rename boards/{arm => v2/gd}/gd32f470i_eval/doc/img/gd32f470i_eval.jpg (100%) rename boards/{arm => v2/gd}/gd32f470i_eval/doc/index.rst (100%) rename boards/{arm => v2/gd}/gd32f470i_eval/gd32f470i_eval-pinctrl.dtsi (100%) rename boards/{arm => v2/gd}/gd32f470i_eval/gd32f470i_eval.dts (100%) rename boards/{arm => v2/gd}/gd32f470i_eval/gd32f470i_eval.yaml (100%) rename boards/{arm => v2/gd}/gd32f470i_eval/gd32f470i_eval_defconfig (69%) rename boards/{arm => v2/gd}/gd32f470i_eval/support/openocd.cfg (100%) diff --git a/boards/arm/gd32f470i_eval/Kconfig.board b/boards/arm/gd32f470i_eval/Kconfig.board deleted file mode 100644 index e860b81a403526..00000000000000 --- a/boards/arm/gd32f470i_eval/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022, Rtone. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32F470I_EVAL - bool "GigaDevice GD32F470I-EVAL" - depends on SOC_GD32F470 diff --git a/boards/arm/gd32f470i_eval/Kconfig.defconfig b/boards/arm/gd32f470i_eval/Kconfig.defconfig deleted file mode 100644 index 89cf5c68842d8d..00000000000000 --- a/boards/arm/gd32f470i_eval/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022, Rtone. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32F470I_EVAL - -config BOARD - default "gd32f470i_eval" - -endif # BOARD_GD32F470I_EVAL diff --git a/boards/v2/gd/gd32f470i_eval/Kconfig.gd32f470i_eval b/boards/v2/gd/gd32f470i_eval/Kconfig.gd32f470i_eval new file mode 100644 index 00000000000000..09ef416cb798b6 --- /dev/null +++ b/boards/v2/gd/gd32f470i_eval/Kconfig.gd32f470i_eval @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32F470I_EVAL + select SOC_GD32F470 diff --git a/boards/arm/gd32f470i_eval/board.cmake b/boards/v2/gd/gd32f470i_eval/board.cmake similarity index 100% rename from boards/arm/gd32f470i_eval/board.cmake rename to boards/v2/gd/gd32f470i_eval/board.cmake diff --git a/boards/v2/gd/gd32f470i_eval/board.yml b/boards/v2/gd/gd32f470i_eval/board.yml new file mode 100644 index 00000000000000..ada2ebc7decd03 --- /dev/null +++ b/boards/v2/gd/gd32f470i_eval/board.yml @@ -0,0 +1,5 @@ +board: + name: gd32f470i_eval + vendor: GigaDevice Semiconductor + socs: + - name: gd32f470 diff --git a/boards/arm/gd32f470i_eval/doc/img/gd32f470i_eval.jpg b/boards/v2/gd/gd32f470i_eval/doc/img/gd32f470i_eval.jpg similarity index 100% rename from boards/arm/gd32f470i_eval/doc/img/gd32f470i_eval.jpg rename to boards/v2/gd/gd32f470i_eval/doc/img/gd32f470i_eval.jpg diff --git a/boards/arm/gd32f470i_eval/doc/index.rst b/boards/v2/gd/gd32f470i_eval/doc/index.rst similarity index 100% rename from boards/arm/gd32f470i_eval/doc/index.rst rename to boards/v2/gd/gd32f470i_eval/doc/index.rst diff --git a/boards/arm/gd32f470i_eval/gd32f470i_eval-pinctrl.dtsi b/boards/v2/gd/gd32f470i_eval/gd32f470i_eval-pinctrl.dtsi similarity index 100% rename from boards/arm/gd32f470i_eval/gd32f470i_eval-pinctrl.dtsi rename to boards/v2/gd/gd32f470i_eval/gd32f470i_eval-pinctrl.dtsi diff --git a/boards/arm/gd32f470i_eval/gd32f470i_eval.dts b/boards/v2/gd/gd32f470i_eval/gd32f470i_eval.dts similarity index 100% rename from boards/arm/gd32f470i_eval/gd32f470i_eval.dts rename to boards/v2/gd/gd32f470i_eval/gd32f470i_eval.dts diff --git a/boards/arm/gd32f470i_eval/gd32f470i_eval.yaml b/boards/v2/gd/gd32f470i_eval/gd32f470i_eval.yaml similarity index 100% rename from boards/arm/gd32f470i_eval/gd32f470i_eval.yaml rename to boards/v2/gd/gd32f470i_eval/gd32f470i_eval.yaml diff --git a/boards/arm/gd32f470i_eval/gd32f470i_eval_defconfig b/boards/v2/gd/gd32f470i_eval/gd32f470i_eval_defconfig similarity index 69% rename from boards/arm/gd32f470i_eval/gd32f470i_eval_defconfig rename to boards/v2/gd/gd32f470i_eval/gd32f470i_eval_defconfig index 9a6f3a893d6e3e..4b47334704de17 100644 --- a/boards/arm/gd32f470i_eval/gd32f470i_eval_defconfig +++ b/boards/v2/gd/gd32f470i_eval/gd32f470i_eval_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2022, Rtone. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32F4XX=y -CONFIG_SOC_GD32F470=y -CONFIG_BOARD_GD32F470I_EVAL=y - CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y diff --git a/boards/arm/gd32f470i_eval/support/openocd.cfg b/boards/v2/gd/gd32f470i_eval/support/openocd.cfg similarity index 100% rename from boards/arm/gd32f470i_eval/support/openocd.cfg rename to boards/v2/gd/gd32f470i_eval/support/openocd.cfg From 5a064f14cb2dc07bae4658500173bd48ae2ee536 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 2 Jan 2024 18:01:29 +0100 Subject: [PATCH 13/18] boards: gd32l233r_eval: convert to HWMv2 Convert the board to HWMv2. Signed-off-by: Gerard Marull-Paretas --- boards/arm/gd32l233r_eval/Kconfig.board | 6 ------ boards/arm/gd32l233r_eval/Kconfig.defconfig | 9 --------- boards/v2/gd/gd32l233r_eval/Kconfig.gd32l233r_eval | 5 +++++ boards/{arm => v2/gd}/gd32l233r_eval/board.cmake | 0 boards/v2/gd/gd32l233r_eval/board.yml | 5 +++++ .../gd}/gd32l233r_eval/doc/img/gd32l233r_eval.jpg | Bin boards/{arm => v2/gd}/gd32l233r_eval/doc/index.rst | 0 .../gd}/gd32l233r_eval/gd32l233r_eval-pinctrl.dtsi | 0 .../gd}/gd32l233r_eval/gd32l233r_eval.dts | 0 .../gd}/gd32l233r_eval/gd32l233r_eval.yaml | 0 .../gd}/gd32l233r_eval/gd32l233r_eval_defconfig | 4 ---- 11 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 boards/arm/gd32l233r_eval/Kconfig.board delete mode 100644 boards/arm/gd32l233r_eval/Kconfig.defconfig create mode 100644 boards/v2/gd/gd32l233r_eval/Kconfig.gd32l233r_eval rename boards/{arm => v2/gd}/gd32l233r_eval/board.cmake (100%) create mode 100644 boards/v2/gd/gd32l233r_eval/board.yml rename boards/{arm => v2/gd}/gd32l233r_eval/doc/img/gd32l233r_eval.jpg (100%) rename boards/{arm => v2/gd}/gd32l233r_eval/doc/index.rst (100%) rename boards/{arm => v2/gd}/gd32l233r_eval/gd32l233r_eval-pinctrl.dtsi (100%) rename boards/{arm => v2/gd}/gd32l233r_eval/gd32l233r_eval.dts (100%) rename boards/{arm => v2/gd}/gd32l233r_eval/gd32l233r_eval.yaml (100%) rename boards/{arm => v2/gd}/gd32l233r_eval/gd32l233r_eval_defconfig (60%) diff --git a/boards/arm/gd32l233r_eval/Kconfig.board b/boards/arm/gd32l233r_eval/Kconfig.board deleted file mode 100644 index 9ef6680e915134..00000000000000 --- a/boards/arm/gd32l233r_eval/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022 BrainCo Inc. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_GD32L233R_EVAL - bool "GigaDevice GD32L233R Evaluation Kit" - depends on SOC_GD32L233 diff --git a/boards/arm/gd32l233r_eval/Kconfig.defconfig b/boards/arm/gd32l233r_eval/Kconfig.defconfig deleted file mode 100644 index 2d25f793d38929..00000000000000 --- a/boards/arm/gd32l233r_eval/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022 BrainCo Inc. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GD32L233R_EVAL - -config BOARD - default "gd32l233r_eval" - -endif # BOARD_GD32L233R_EVAL diff --git a/boards/v2/gd/gd32l233r_eval/Kconfig.gd32l233r_eval b/boards/v2/gd/gd32l233r_eval/Kconfig.gd32l233r_eval new file mode 100644 index 00000000000000..ee489163d9a1af --- /dev/null +++ b/boards/v2/gd/gd32l233r_eval/Kconfig.gd32l233r_eval @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_GD32L233R_EVAL + select SOC_GD32L233 diff --git a/boards/arm/gd32l233r_eval/board.cmake b/boards/v2/gd/gd32l233r_eval/board.cmake similarity index 100% rename from boards/arm/gd32l233r_eval/board.cmake rename to boards/v2/gd/gd32l233r_eval/board.cmake diff --git a/boards/v2/gd/gd32l233r_eval/board.yml b/boards/v2/gd/gd32l233r_eval/board.yml new file mode 100644 index 00000000000000..c589835e92cca8 --- /dev/null +++ b/boards/v2/gd/gd32l233r_eval/board.yml @@ -0,0 +1,5 @@ +board: + name: gd32l233r_eval + vendor: GigaDevice Semiconductor + socs: + - name: gd32l233 diff --git a/boards/arm/gd32l233r_eval/doc/img/gd32l233r_eval.jpg b/boards/v2/gd/gd32l233r_eval/doc/img/gd32l233r_eval.jpg similarity index 100% rename from boards/arm/gd32l233r_eval/doc/img/gd32l233r_eval.jpg rename to boards/v2/gd/gd32l233r_eval/doc/img/gd32l233r_eval.jpg diff --git a/boards/arm/gd32l233r_eval/doc/index.rst b/boards/v2/gd/gd32l233r_eval/doc/index.rst similarity index 100% rename from boards/arm/gd32l233r_eval/doc/index.rst rename to boards/v2/gd/gd32l233r_eval/doc/index.rst diff --git a/boards/arm/gd32l233r_eval/gd32l233r_eval-pinctrl.dtsi b/boards/v2/gd/gd32l233r_eval/gd32l233r_eval-pinctrl.dtsi similarity index 100% rename from boards/arm/gd32l233r_eval/gd32l233r_eval-pinctrl.dtsi rename to boards/v2/gd/gd32l233r_eval/gd32l233r_eval-pinctrl.dtsi diff --git a/boards/arm/gd32l233r_eval/gd32l233r_eval.dts b/boards/v2/gd/gd32l233r_eval/gd32l233r_eval.dts similarity index 100% rename from boards/arm/gd32l233r_eval/gd32l233r_eval.dts rename to boards/v2/gd/gd32l233r_eval/gd32l233r_eval.dts diff --git a/boards/arm/gd32l233r_eval/gd32l233r_eval.yaml b/boards/v2/gd/gd32l233r_eval/gd32l233r_eval.yaml similarity index 100% rename from boards/arm/gd32l233r_eval/gd32l233r_eval.yaml rename to boards/v2/gd/gd32l233r_eval/gd32l233r_eval.yaml diff --git a/boards/arm/gd32l233r_eval/gd32l233r_eval_defconfig b/boards/v2/gd/gd32l233r_eval/gd32l233r_eval_defconfig similarity index 60% rename from boards/arm/gd32l233r_eval/gd32l233r_eval_defconfig rename to boards/v2/gd/gd32l233r_eval/gd32l233r_eval_defconfig index 866f00cfabbad7..32b8efcc716584 100644 --- a/boards/arm/gd32l233r_eval/gd32l233r_eval_defconfig +++ b/boards/v2/gd/gd32l233r_eval/gd32l233r_eval_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2022 BrainCo Inc. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32L23X=y -CONFIG_SOC_GD32L233=y -CONFIG_BOARD_GD32L233R_EVAL=y - CONFIG_SERIAL=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y From 1e394b246eeadece66293e70fd45a6fe0a3459d2 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 2 Jan 2024 18:29:32 +0100 Subject: [PATCH 14/18] maintainers: update GD32 paths Some SoC/board files have been moved, use new paths. Signed-off-by: Gerard Marull-Paretas --- MAINTAINERS.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index f45375e39eb7fe..95dfc8af613837 100644 --- a/MAINTAINERS.yml +++ b/MAINTAINERS.yml @@ -2990,7 +2990,7 @@ GD32 Platforms: - gmarull - soburi files: - - boards/arm/gd32*/ + - boards/v2/gd/ - boards/riscv/gd32*/ - boards/riscv/longan_nano/ - drivers/*/*gd32* From a54d8ab6b2161896c967430942bb0e3b62481855 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Wed, 3 Jan 2024 10:07:54 +0100 Subject: [PATCH 15/18] boards: gigadevice: add documentation entry Add an entry for Gigadevice boards. Signed-off-by: Gerard Marull-Paretas --- boards/index.rst | 2 ++ boards/v2/gd/index.rst | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 boards/v2/gd/index.rst diff --git a/boards/index.rst b/boards/index.rst index 9c843c9e95ba09..4fe88259603431 100644 --- a/boards/index.rst +++ b/boards/index.rst @@ -27,3 +27,5 @@ available under :zephyr_file:`doc/templates/board.tmpl`. x86/index.rst xtensa/index.rst shields/index.rst + + v2/gd/index.rst diff --git a/boards/v2/gd/index.rst b/boards/v2/gd/index.rst new file mode 100644 index 00000000000000..79f0a161ca837f --- /dev/null +++ b/boards/v2/gd/index.rst @@ -0,0 +1,10 @@ +.. _boards-gd: + +GigaDevice Semiconductor +######################## + +.. toctree:: + :maxdepth: 1 + :glob: + + **/* From a6514db6c881ba09945498c30720c38b0a6c0e39 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Wed, 3 Jan 2024 10:11:01 +0100 Subject: [PATCH 16/18] boards: arm: add documentation entry Add a new entry for ARM Holdings plc boards. Signed-off-by: Gerard Marull-Paretas --- boards/index.rst | 1 + boards/v2/arm/index.rst | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 boards/v2/arm/index.rst diff --git a/boards/index.rst b/boards/index.rst index 4fe88259603431..959f28599b7397 100644 --- a/boards/index.rst +++ b/boards/index.rst @@ -28,4 +28,5 @@ available under :zephyr_file:`doc/templates/board.tmpl`. xtensa/index.rst shields/index.rst + v2/arm/index.rst v2/gd/index.rst diff --git a/boards/v2/arm/index.rst b/boards/v2/arm/index.rst new file mode 100644 index 00000000000000..86a7d37bc7c3aa --- /dev/null +++ b/boards/v2/arm/index.rst @@ -0,0 +1,10 @@ +.. _boards-arm-ltd: + +ARM Ltd. +######## + +.. toctree:: + :maxdepth: 1 + :glob: + + **/* From 6a95abeb4821c4aec2eea29f932d75112e50f5b7 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Wed, 3 Jan 2024 10:11:55 +0100 Subject: [PATCH 17/18] boards: renesas: add documentation entry Add a new entry for Renesas boards. Signed-off-by: Gerard Marull-Paretas --- boards/index.rst | 1 + boards/v2/renesas/index.rst | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 boards/v2/renesas/index.rst diff --git a/boards/index.rst b/boards/index.rst index 959f28599b7397..3019bb35dcd0d8 100644 --- a/boards/index.rst +++ b/boards/index.rst @@ -30,3 +30,4 @@ available under :zephyr_file:`doc/templates/board.tmpl`. v2/arm/index.rst v2/gd/index.rst + v2/renesas/index.rst diff --git a/boards/v2/renesas/index.rst b/boards/v2/renesas/index.rst new file mode 100644 index 00000000000000..2597c70e29e5d6 --- /dev/null +++ b/boards/v2/renesas/index.rst @@ -0,0 +1,10 @@ +.. _boards-renesas: + +Renesas Electronics Corporation +############################### + +.. toctree:: + :maxdepth: 1 + :glob: + + **/* From fffc78334c011c83d03ca2b2464da3768fcae2ef Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Wed, 10 Jan 2024 11:17:18 +0100 Subject: [PATCH 18/18] maintainers: update Renesas RZT2M path SoC has been converted to v2. Signed-off-by: Gerard Marull-Paretas --- MAINTAINERS.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index 95dfc8af613837..11751c75821ee9 100644 --- a/MAINTAINERS.yml +++ b/MAINTAINERS.yml @@ -3284,7 +3284,7 @@ Renesas Platforms: files: - soc/arm/renesas_ra/ - dts/arm/renesas/ra/ - - soc/arm/renesas_rzt2m/ + - soc/v2/renesas_rzt2m/ labels: - "platforms: Renesas"