diff --git a/boards/boards_legacy/arm/google_twinkie_v2/Kconfig.defconfig b/boards/boards_legacy/arm/google_twinkie_v2/Kconfig.defconfig deleted file mode 100644 index 16350500a23234..00000000000000 --- a/boards/boards_legacy/arm/google_twinkie_v2/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2023 The ChromiumOS Authors -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_GOOGLE_TWINKIE_V2 - -config BOARD - default "google_twinkie_v2" - -endif # BOARD_GOOGLE_TWINKIE_V2 diff --git a/boards/boards_legacy/arm/nucleo_g031k8/Kconfig.board b/boards/boards_legacy/arm/nucleo_g031k8/Kconfig.board deleted file mode 100644 index 02133d332572bc..00000000000000 --- a/boards/boards_legacy/arm/nucleo_g031k8/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32 Nucleo-32 development board with STM32G031K8 MCU configuration - -# Copyright (c) 2022 Joylab AG -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_G031K8 - bool "NUCLEO-32 G031K8 Development Board" - depends on SOC_STM32G031XX diff --git a/boards/boards_legacy/arm/nucleo_g070rb/Kconfig.board b/boards/boards_legacy/arm/nucleo_g070rb/Kconfig.board deleted file mode 100644 index eb32da85a2e3da..00000000000000 --- a/boards/boards_legacy/arm/nucleo_g070rb/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32 Nucleo-64 development board with STM32G070RB MCU configuration - -# Copyright (c) 2023 Marin Jurjević -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_G070RB - bool "NUCLEO-64 G070RB Development Board" - depends on SOC_STM32G070XX diff --git a/boards/boards_legacy/arm/nucleo_g070rb/Kconfig.defconfig b/boards/boards_legacy/arm/nucleo_g070rb/Kconfig.defconfig deleted file mode 100644 index 7fd80219e44f0b..00000000000000 --- a/boards/boards_legacy/arm/nucleo_g070rb/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32 Nucleo-64 development board with STM32G070RB MCU - -# Copyright (c) 2023 Marin Jurjević -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NUCLEO_G070RB - -config BOARD - default "nucleo_g070rb" - -endif # BOARD_NUCLEO_G070RB diff --git a/boards/boards_legacy/arm/nucleo_g071rb/Kconfig.board b/boards/boards_legacy/arm/nucleo_g071rb/Kconfig.board deleted file mode 100644 index 97a74c8dfc5028..00000000000000 --- a/boards/boards_legacy/arm/nucleo_g071rb/Kconfig.board +++ /dev/null @@ -1,9 +0,0 @@ -# STM32 Nucleo-64 development board with STM32G071RB MCU configuration - -# Copyright (c) 2019 Philippe Retornaz -# Copyright (c) 2019 STMicroelectronics -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_G071RB - bool "NUCLEO-64 G071RB Development Board" - depends on SOC_STM32G071XX diff --git a/boards/boards_legacy/arm/nucleo_g071rb/Kconfig.defconfig b/boards/boards_legacy/arm/nucleo_g071rb/Kconfig.defconfig deleted file mode 100644 index 9333f392112390..00000000000000 --- a/boards/boards_legacy/arm/nucleo_g071rb/Kconfig.defconfig +++ /dev/null @@ -1,12 +0,0 @@ -# STM32 Nucleo-64 development board with STM32G071RB MCU - -# Copyright (c) 2019 Philippe Retornaz -# Copyright (c) 2019 STMicroelectronics -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NUCLEO_G071RB - -config BOARD - default "nucleo_g071rb" - -endif # BOARD_NUCLEO_G071RB diff --git a/boards/boards_legacy/arm/nucleo_g0b1re/Kconfig.board b/boards/boards_legacy/arm/nucleo_g0b1re/Kconfig.board deleted file mode 100644 index cce6734f45d651..00000000000000 --- a/boards/boards_legacy/arm/nucleo_g0b1re/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32 Nucleo-64 development board with STM32G0B1RE MCU configuration - -# Copyright (c) 2019 Thomas Stranger -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_G0B1RE - bool "NUCLEO-64 G0B1RE Development Board" - depends on SOC_STM32G0B1XX diff --git a/boards/boards_legacy/arm/nucleo_g0b1re/Kconfig.defconfig b/boards/boards_legacy/arm/nucleo_g0b1re/Kconfig.defconfig deleted file mode 100644 index 92a2c028d30ef2..00000000000000 --- a/boards/boards_legacy/arm/nucleo_g0b1re/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32 Nucleo-64 development board with STM32G0B1RE MCU - -# Copyright (c) 2020 Thomas Stranger -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NUCLEO_G0B1RE - -config BOARD - default "nucleo_g0b1re" - -endif # BOARD_NUCLEO_G0B1RE diff --git a/boards/boards_legacy/arm/stm32g0316_disco/Kconfig.board b/boards/boards_legacy/arm/stm32g0316_disco/Kconfig.board deleted file mode 100644 index 3f00f126fe3d0b..00000000000000 --- a/boards/boards_legacy/arm/stm32g0316_disco/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32G0316 Discovery board configuration - -# Copyright (c) 2019 SEAL AG -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32G0316_DISCO - bool "STM32G0316 Discovery Development Board" - depends on SOC_STM32G031XX diff --git a/boards/boards_legacy/arm/stm32g0316_disco/Kconfig.defconfig b/boards/boards_legacy/arm/stm32g0316_disco/Kconfig.defconfig deleted file mode 100644 index 3016470eb561d1..00000000000000 --- a/boards/boards_legacy/arm/stm32g0316_disco/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32G0316 Discovery board configuration - -# Copyright (c) 2019 SEAL AG -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32G0316_DISCO - -config BOARD - default "stm32g0316_disco" - -endif # BOARD_STM32G0316_DISCO diff --git a/boards/boards_legacy/arm/stm32g071b_disco/Kconfig.defconfig b/boards/boards_legacy/arm/stm32g071b_disco/Kconfig.defconfig deleted file mode 100644 index 195b8ecdf4ffc1..00000000000000 --- a/boards/boards_legacy/arm/stm32g071b_disco/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32G071B Discovery board configuration - -# Copyright 2021 The Chromium OS Authors -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32G071B_DISCO - -config BOARD - default "stm32g071b_disco" - -endif # BOARD_STM32G071B_DISCO diff --git a/boards/boards_legacy/arm/stm32g081b_eval/Kconfig.defconfig b/boards/boards_legacy/arm/stm32g081b_eval/Kconfig.defconfig deleted file mode 100644 index 548b4d75cc13ab..00000000000000 --- a/boards/boards_legacy/arm/stm32g081b_eval/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32G081B evaluation board configuration - -# Copyright 2021 The Chromium OS Authors -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32G081B_EVAL - -config BOARD - default "stm32g081b_eval" - -endif # BOARD_STM32G081B_EVAL diff --git a/boards/boards_legacy/arm/google_twinkie_v2/Kconfig.board b/boards/google/google_twinkie_v2/Kconfig.google_twinkie_v2 similarity index 64% rename from boards/boards_legacy/arm/google_twinkie_v2/Kconfig.board rename to boards/google/google_twinkie_v2/Kconfig.google_twinkie_v2 index 45f571ca2b0640..52f0de57ebb533 100644 --- a/boards/boards_legacy/arm/google_twinkie_v2/Kconfig.board +++ b/boards/google/google_twinkie_v2/Kconfig.google_twinkie_v2 @@ -2,5 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_GOOGLE_TWINKIE_V2 - bool "Google Twinkie V2 Board" - depends on SOC_STM32G0B1XX + select SOC_STM32G0B1XX diff --git a/boards/boards_legacy/arm/google_twinkie_v2/board.cmake b/boards/google/google_twinkie_v2/board.cmake similarity index 100% rename from boards/boards_legacy/arm/google_twinkie_v2/board.cmake rename to boards/google/google_twinkie_v2/board.cmake diff --git a/boards/google/google_twinkie_v2/board.yml b/boards/google/google_twinkie_v2/board.yml new file mode 100644 index 00000000000000..b77d79328f71a3 --- /dev/null +++ b/boards/google/google_twinkie_v2/board.yml @@ -0,0 +1,5 @@ +board: + name: google_twinkie_v2 + vendor: google + socs: + - name: stm32g0b1xx diff --git a/boards/boards_legacy/arm/google_twinkie_v2/doc/index.rst b/boards/google/google_twinkie_v2/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/google_twinkie_v2/doc/index.rst rename to boards/google/google_twinkie_v2/doc/index.rst diff --git a/boards/boards_legacy/arm/google_twinkie_v2/google_twinkie_v2.dts b/boards/google/google_twinkie_v2/google_twinkie_v2.dts similarity index 100% rename from boards/boards_legacy/arm/google_twinkie_v2/google_twinkie_v2.dts rename to boards/google/google_twinkie_v2/google_twinkie_v2.dts diff --git a/boards/boards_legacy/arm/google_twinkie_v2/google_twinkie_v2.yaml b/boards/google/google_twinkie_v2/google_twinkie_v2.yaml similarity index 100% rename from boards/boards_legacy/arm/google_twinkie_v2/google_twinkie_v2.yaml rename to boards/google/google_twinkie_v2/google_twinkie_v2.yaml diff --git a/boards/boards_legacy/arm/google_twinkie_v2/google_twinkie_v2_defconfig b/boards/google/google_twinkie_v2/google_twinkie_v2_defconfig similarity index 80% rename from boards/boards_legacy/arm/google_twinkie_v2/google_twinkie_v2_defconfig rename to boards/google/google_twinkie_v2/google_twinkie_v2_defconfig index 040be2d3672562..3262a345bd28e5 100644 --- a/boards/boards_legacy/arm/google_twinkie_v2/google_twinkie_v2_defconfig +++ b/boards/google/google_twinkie_v2/google_twinkie_v2_defconfig @@ -2,9 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32G0X=y -CONFIG_SOC_STM32G0B1XX=y - # GPIO Controller CONFIG_GPIO=y diff --git a/boards/boards_legacy/arm/nucleo_g031k8/Kconfig.defconfig b/boards/st/nucleo_g031k8/Kconfig.defconfig similarity index 86% rename from boards/boards_legacy/arm/nucleo_g031k8/Kconfig.defconfig rename to boards/st/nucleo_g031k8/Kconfig.defconfig index b448461f39ec2f..2c6c84ed50d9eb 100644 --- a/boards/boards_legacy/arm/nucleo_g031k8/Kconfig.defconfig +++ b/boards/st/nucleo_g031k8/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_NUCLEO_G031K8 -config BOARD - default "nucleo_g031k8" - config SPI_STM32_INTERRUPT default y depends on SPI diff --git a/boards/st/nucleo_g031k8/Kconfig.nucleo_g031k8 b/boards/st/nucleo_g031k8/Kconfig.nucleo_g031k8 new file mode 100644 index 00000000000000..b748af9991d980 --- /dev/null +++ b/boards/st/nucleo_g031k8/Kconfig.nucleo_g031k8 @@ -0,0 +1,5 @@ +# Copyright (c) 2022 Joylab AG +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_G031K8 + select SOC_STM32G031XX diff --git a/boards/boards_legacy/arm/nucleo_g031k8/arduino_nano_r3_connector.dtsi b/boards/st/nucleo_g031k8/arduino_nano_r3_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/nucleo_g031k8/arduino_nano_r3_connector.dtsi rename to boards/st/nucleo_g031k8/arduino_nano_r3_connector.dtsi diff --git a/boards/boards_legacy/arm/nucleo_g031k8/board.cmake b/boards/st/nucleo_g031k8/board.cmake similarity index 100% rename from boards/boards_legacy/arm/nucleo_g031k8/board.cmake rename to boards/st/nucleo_g031k8/board.cmake diff --git a/boards/st/nucleo_g031k8/board.yml b/boards/st/nucleo_g031k8/board.yml new file mode 100644 index 00000000000000..690afd52fb0dd4 --- /dev/null +++ b/boards/st/nucleo_g031k8/board.yml @@ -0,0 +1,5 @@ +board: + name: nucleo_g031k8 + vendor: st + socs: + - name: stm32g031xx diff --git a/boards/boards_legacy/arm/nucleo_g031k8/doc/img/nucleo_g031k8.jpg b/boards/st/nucleo_g031k8/doc/img/nucleo_g031k8.jpg similarity index 100% rename from boards/boards_legacy/arm/nucleo_g031k8/doc/img/nucleo_g031k8.jpg rename to boards/st/nucleo_g031k8/doc/img/nucleo_g031k8.jpg diff --git a/boards/boards_legacy/arm/nucleo_g031k8/doc/index.rst b/boards/st/nucleo_g031k8/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/nucleo_g031k8/doc/index.rst rename to boards/st/nucleo_g031k8/doc/index.rst diff --git a/boards/boards_legacy/arm/nucleo_g031k8/nucleo_g031k8.dts b/boards/st/nucleo_g031k8/nucleo_g031k8.dts similarity index 100% rename from boards/boards_legacy/arm/nucleo_g031k8/nucleo_g031k8.dts rename to boards/st/nucleo_g031k8/nucleo_g031k8.dts diff --git a/boards/boards_legacy/arm/nucleo_g031k8/nucleo_g031k8.yaml b/boards/st/nucleo_g031k8/nucleo_g031k8.yaml similarity index 100% rename from boards/boards_legacy/arm/nucleo_g031k8/nucleo_g031k8.yaml rename to boards/st/nucleo_g031k8/nucleo_g031k8.yaml diff --git a/boards/boards_legacy/arm/nucleo_g031k8/nucleo_g031k8_defconfig b/boards/st/nucleo_g031k8/nucleo_g031k8_defconfig similarity index 78% rename from boards/boards_legacy/arm/nucleo_g031k8/nucleo_g031k8_defconfig rename to boards/st/nucleo_g031k8/nucleo_g031k8_defconfig index e4a8706b596ea2..06484e88bea72c 100644 --- a/boards/boards_legacy/arm/nucleo_g031k8/nucleo_g031k8_defconfig +++ b/boards/st/nucleo_g031k8/nucleo_g031k8_defconfig @@ -1,11 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -# Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32G0X=y - -# Platform Configuration -CONFIG_SOC_STM32G031XX=y - # Kernel Options due to Low Memory (8k) CONFIG_MAIN_STACK_SIZE=640 CONFIG_IDLE_STACK_SIZE=200 diff --git a/boards/boards_legacy/arm/nucleo_g031k8/support/openocd.cfg b/boards/st/nucleo_g031k8/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/nucleo_g031k8/support/openocd.cfg rename to boards/st/nucleo_g031k8/support/openocd.cfg diff --git a/boards/st/nucleo_g070rb/Kconfig.nucleo_g070rb b/boards/st/nucleo_g070rb/Kconfig.nucleo_g070rb new file mode 100644 index 00000000000000..0465a3f42736c9 --- /dev/null +++ b/boards/st/nucleo_g070rb/Kconfig.nucleo_g070rb @@ -0,0 +1,5 @@ +# Copyright (c) 2023 Marin Jurjević +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_G070RB + select SOC_STM32G070XX diff --git a/boards/boards_legacy/arm/nucleo_g070rb/arduino_r3_connector.dtsi b/boards/st/nucleo_g070rb/arduino_r3_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/nucleo_g070rb/arduino_r3_connector.dtsi rename to boards/st/nucleo_g070rb/arduino_r3_connector.dtsi diff --git a/boards/boards_legacy/arm/nucleo_g070rb/board.cmake b/boards/st/nucleo_g070rb/board.cmake similarity index 100% rename from boards/boards_legacy/arm/nucleo_g070rb/board.cmake rename to boards/st/nucleo_g070rb/board.cmake diff --git a/boards/st/nucleo_g070rb/board.yml b/boards/st/nucleo_g070rb/board.yml new file mode 100644 index 00000000000000..88306b0d7f08cb --- /dev/null +++ b/boards/st/nucleo_g070rb/board.yml @@ -0,0 +1,5 @@ +board: + name: nucleo_g070rb + vendor: st + socs: + - name: stm32g070xx diff --git a/boards/boards_legacy/arm/nucleo_g070rb/doc/img/nucleo_g070rb.jpg b/boards/st/nucleo_g070rb/doc/img/nucleo_g070rb.jpg similarity index 100% rename from boards/boards_legacy/arm/nucleo_g070rb/doc/img/nucleo_g070rb.jpg rename to boards/st/nucleo_g070rb/doc/img/nucleo_g070rb.jpg diff --git a/boards/boards_legacy/arm/nucleo_g070rb/doc/index.rst b/boards/st/nucleo_g070rb/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/nucleo_g070rb/doc/index.rst rename to boards/st/nucleo_g070rb/doc/index.rst diff --git a/boards/boards_legacy/arm/nucleo_g070rb/nucleo_g070rb.dts b/boards/st/nucleo_g070rb/nucleo_g070rb.dts similarity index 100% rename from boards/boards_legacy/arm/nucleo_g070rb/nucleo_g070rb.dts rename to boards/st/nucleo_g070rb/nucleo_g070rb.dts diff --git a/boards/boards_legacy/arm/nucleo_g070rb/nucleo_g070rb.yaml b/boards/st/nucleo_g070rb/nucleo_g070rb.yaml similarity index 100% rename from boards/boards_legacy/arm/nucleo_g070rb/nucleo_g070rb.yaml rename to boards/st/nucleo_g070rb/nucleo_g070rb.yaml diff --git a/boards/boards_legacy/arm/nucleo_g070rb/nucleo_g070rb_defconfig b/boards/st/nucleo_g070rb/nucleo_g070rb_defconfig similarity index 75% rename from boards/boards_legacy/arm/nucleo_g070rb/nucleo_g070rb_defconfig rename to boards/st/nucleo_g070rb/nucleo_g070rb_defconfig index cf5cff7fe61a24..0055481a2e8f4a 100644 --- a/boards/boards_legacy/arm/nucleo_g070rb/nucleo_g070rb_defconfig +++ b/boards/st/nucleo_g070rb/nucleo_g070rb_defconfig @@ -1,7 +1,3 @@ -# Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32G0X=y -CONFIG_SOC_STM32G070XX=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/nucleo_g070rb/support/openocd.cfg b/boards/st/nucleo_g070rb/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/nucleo_g070rb/support/openocd.cfg rename to boards/st/nucleo_g070rb/support/openocd.cfg diff --git a/boards/st/nucleo_g071rb/Kconfig.nucleo_g071rb b/boards/st/nucleo_g071rb/Kconfig.nucleo_g071rb new file mode 100644 index 00000000000000..4237b458f47640 --- /dev/null +++ b/boards/st/nucleo_g071rb/Kconfig.nucleo_g071rb @@ -0,0 +1,5 @@ +# Copyright (c) 2019 STMicroelectronics +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_G071RB + select SOC_STM32G071XX diff --git a/boards/boards_legacy/arm/nucleo_g071rb/arduino_r3_connector.dtsi b/boards/st/nucleo_g071rb/arduino_r3_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/nucleo_g071rb/arduino_r3_connector.dtsi rename to boards/st/nucleo_g071rb/arduino_r3_connector.dtsi diff --git a/boards/boards_legacy/arm/nucleo_g071rb/board.cmake b/boards/st/nucleo_g071rb/board.cmake similarity index 100% rename from boards/boards_legacy/arm/nucleo_g071rb/board.cmake rename to boards/st/nucleo_g071rb/board.cmake diff --git a/boards/st/nucleo_g071rb/board.yml b/boards/st/nucleo_g071rb/board.yml new file mode 100644 index 00000000000000..05e948a2f36bea --- /dev/null +++ b/boards/st/nucleo_g071rb/board.yml @@ -0,0 +1,5 @@ +board: + name: nucleo_g071rb + vendor: st + socs: + - name: stm32g071xx diff --git a/boards/boards_legacy/arm/nucleo_g071rb/doc/img/nucleo_g071rb.jpg b/boards/st/nucleo_g071rb/doc/img/nucleo_g071rb.jpg similarity index 100% rename from boards/boards_legacy/arm/nucleo_g071rb/doc/img/nucleo_g071rb.jpg rename to boards/st/nucleo_g071rb/doc/img/nucleo_g071rb.jpg diff --git a/boards/boards_legacy/arm/nucleo_g071rb/doc/index.rst b/boards/st/nucleo_g071rb/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/nucleo_g071rb/doc/index.rst rename to boards/st/nucleo_g071rb/doc/index.rst diff --git a/boards/boards_legacy/arm/nucleo_g071rb/nucleo_g071rb.dts b/boards/st/nucleo_g071rb/nucleo_g071rb.dts similarity index 100% rename from boards/boards_legacy/arm/nucleo_g071rb/nucleo_g071rb.dts rename to boards/st/nucleo_g071rb/nucleo_g071rb.dts diff --git a/boards/boards_legacy/arm/nucleo_g071rb/nucleo_g071rb.yaml b/boards/st/nucleo_g071rb/nucleo_g071rb.yaml similarity index 100% rename from boards/boards_legacy/arm/nucleo_g071rb/nucleo_g071rb.yaml rename to boards/st/nucleo_g071rb/nucleo_g071rb.yaml diff --git a/boards/boards_legacy/arm/nucleo_g071rb/nucleo_g071rb_defconfig b/boards/st/nucleo_g071rb/nucleo_g071rb_defconfig similarity index 75% rename from boards/boards_legacy/arm/nucleo_g071rb/nucleo_g071rb_defconfig rename to boards/st/nucleo_g071rb/nucleo_g071rb_defconfig index 71cc51e4ffcf8f..0055481a2e8f4a 100644 --- a/boards/boards_legacy/arm/nucleo_g071rb/nucleo_g071rb_defconfig +++ b/boards/st/nucleo_g071rb/nucleo_g071rb_defconfig @@ -1,7 +1,3 @@ -# Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32G0X=y -CONFIG_SOC_STM32G071XX=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/nucleo_g071rb/support/openocd.cfg b/boards/st/nucleo_g071rb/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/nucleo_g071rb/support/openocd.cfg rename to boards/st/nucleo_g071rb/support/openocd.cfg diff --git a/boards/st/nucleo_g0b1re/Kconfig.nucleo_g0b1re b/boards/st/nucleo_g0b1re/Kconfig.nucleo_g0b1re new file mode 100644 index 00000000000000..05d7b4b18622b3 --- /dev/null +++ b/boards/st/nucleo_g0b1re/Kconfig.nucleo_g0b1re @@ -0,0 +1,5 @@ +# Copyright (c) 2019 Thomas Stranger +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_G0B1RE + select SOC_STM32G0B1XX diff --git a/boards/boards_legacy/arm/nucleo_g0b1re/arduino_r3_connector.dtsi b/boards/st/nucleo_g0b1re/arduino_r3_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/nucleo_g0b1re/arduino_r3_connector.dtsi rename to boards/st/nucleo_g0b1re/arduino_r3_connector.dtsi diff --git a/boards/boards_legacy/arm/nucleo_g0b1re/board.cmake b/boards/st/nucleo_g0b1re/board.cmake similarity index 100% rename from boards/boards_legacy/arm/nucleo_g0b1re/board.cmake rename to boards/st/nucleo_g0b1re/board.cmake diff --git a/boards/st/nucleo_g0b1re/board.yml b/boards/st/nucleo_g0b1re/board.yml new file mode 100644 index 00000000000000..b9d0f93261f70a --- /dev/null +++ b/boards/st/nucleo_g0b1re/board.yml @@ -0,0 +1,5 @@ +board: + name: nucleo_g0b1re + vendor: st + socs: + - name: stm32g0b1xx diff --git a/boards/boards_legacy/arm/nucleo_g0b1re/doc/img/nucleo_g0b1re.jpg b/boards/st/nucleo_g0b1re/doc/img/nucleo_g0b1re.jpg similarity index 100% rename from boards/boards_legacy/arm/nucleo_g0b1re/doc/img/nucleo_g0b1re.jpg rename to boards/st/nucleo_g0b1re/doc/img/nucleo_g0b1re.jpg diff --git a/boards/boards_legacy/arm/nucleo_g0b1re/doc/index.rst b/boards/st/nucleo_g0b1re/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/nucleo_g0b1re/doc/index.rst rename to boards/st/nucleo_g0b1re/doc/index.rst diff --git a/boards/boards_legacy/arm/nucleo_g0b1re/nucleo_g0b1re.dts b/boards/st/nucleo_g0b1re/nucleo_g0b1re.dts similarity index 100% rename from boards/boards_legacy/arm/nucleo_g0b1re/nucleo_g0b1re.dts rename to boards/st/nucleo_g0b1re/nucleo_g0b1re.dts diff --git a/boards/boards_legacy/arm/nucleo_g0b1re/nucleo_g0b1re.yaml b/boards/st/nucleo_g0b1re/nucleo_g0b1re.yaml similarity index 100% rename from boards/boards_legacy/arm/nucleo_g0b1re/nucleo_g0b1re.yaml rename to boards/st/nucleo_g0b1re/nucleo_g0b1re.yaml diff --git a/boards/boards_legacy/arm/nucleo_g0b1re/nucleo_g0b1re_defconfig b/boards/st/nucleo_g0b1re/nucleo_g0b1re_defconfig similarity index 75% rename from boards/boards_legacy/arm/nucleo_g0b1re/nucleo_g0b1re_defconfig rename to boards/st/nucleo_g0b1re/nucleo_g0b1re_defconfig index c57537f7c31071..84d7129fd51728 100644 --- a/boards/boards_legacy/arm/nucleo_g0b1re/nucleo_g0b1re_defconfig +++ b/boards/st/nucleo_g0b1re/nucleo_g0b1re_defconfig @@ -1,7 +1,3 @@ -# Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32G0X=y -CONFIG_SOC_STM32G0B1XX=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/nucleo_g0b1re/support/openocd.cfg b/boards/st/nucleo_g0b1re/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/nucleo_g0b1re/support/openocd.cfg rename to boards/st/nucleo_g0b1re/support/openocd.cfg diff --git a/boards/st/stm32g0316_disco/Kconfig.stm32g0316_disco b/boards/st/stm32g0316_disco/Kconfig.stm32g0316_disco new file mode 100644 index 00000000000000..b0f55e7bba7022 --- /dev/null +++ b/boards/st/stm32g0316_disco/Kconfig.stm32g0316_disco @@ -0,0 +1,5 @@ +# Copyright (c) 2019 SEAL AG +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32G0316_DISCO + select SOC_STM32G031XX diff --git a/boards/boards_legacy/arm/stm32g0316_disco/board.cmake b/boards/st/stm32g0316_disco/board.cmake similarity index 100% rename from boards/boards_legacy/arm/stm32g0316_disco/board.cmake rename to boards/st/stm32g0316_disco/board.cmake diff --git a/boards/st/stm32g0316_disco/board.yml b/boards/st/stm32g0316_disco/board.yml new file mode 100644 index 00000000000000..5a67daf81d6bb6 --- /dev/null +++ b/boards/st/stm32g0316_disco/board.yml @@ -0,0 +1,5 @@ +board: + name: stm32g0316_disco + vendor: st + socs: + - name: stm32g031xx diff --git a/boards/boards_legacy/arm/stm32g0316_disco/doc/img/stm32g0316_disco.jpg b/boards/st/stm32g0316_disco/doc/img/stm32g0316_disco.jpg similarity index 100% rename from boards/boards_legacy/arm/stm32g0316_disco/doc/img/stm32g0316_disco.jpg rename to boards/st/stm32g0316_disco/doc/img/stm32g0316_disco.jpg diff --git a/boards/boards_legacy/arm/stm32g0316_disco/doc/index.rst b/boards/st/stm32g0316_disco/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/stm32g0316_disco/doc/index.rst rename to boards/st/stm32g0316_disco/doc/index.rst diff --git a/boards/boards_legacy/arm/stm32g0316_disco/stm32g0316_disco.dts b/boards/st/stm32g0316_disco/stm32g0316_disco.dts similarity index 100% rename from boards/boards_legacy/arm/stm32g0316_disco/stm32g0316_disco.dts rename to boards/st/stm32g0316_disco/stm32g0316_disco.dts diff --git a/boards/boards_legacy/arm/stm32g0316_disco/stm32g0316_disco.yaml b/boards/st/stm32g0316_disco/stm32g0316_disco.yaml similarity index 100% rename from boards/boards_legacy/arm/stm32g0316_disco/stm32g0316_disco.yaml rename to boards/st/stm32g0316_disco/stm32g0316_disco.yaml diff --git a/boards/boards_legacy/arm/stm32g0316_disco/stm32g0316_disco_defconfig b/boards/st/stm32g0316_disco/stm32g0316_disco_defconfig similarity index 80% rename from boards/boards_legacy/arm/stm32g0316_disco/stm32g0316_disco_defconfig rename to boards/st/stm32g0316_disco/stm32g0316_disco_defconfig index a790e064bf6c14..f846f1d12a72e3 100644 --- a/boards/boards_legacy/arm/stm32g0316_disco/stm32g0316_disco_defconfig +++ b/boards/st/stm32g0316_disco/stm32g0316_disco_defconfig @@ -1,7 +1,3 @@ -# Zephyr Kernel Configuration -CONFIG_SOC_SERIES_STM32G0X=y -CONFIG_SOC_STM32G031XX=y - # Kernel Options due to Low Memory (8k) CONFIG_MAIN_STACK_SIZE=640 CONFIG_IDLE_STACK_SIZE=200 diff --git a/boards/boards_legacy/arm/stm32g071b_disco/Kconfig.board b/boards/st/stm32g071b_disco/Kconfig.stm32g071b_disco similarity index 50% rename from boards/boards_legacy/arm/stm32g071b_disco/Kconfig.board rename to boards/st/stm32g071b_disco/Kconfig.stm32g071b_disco index 897dcce606db1d..78241c936dc340 100644 --- a/boards/boards_legacy/arm/stm32g071b_disco/Kconfig.board +++ b/boards/st/stm32g071b_disco/Kconfig.stm32g071b_disco @@ -1,8 +1,5 @@ -# STM32G071B Discovery board configuration - # Copyright 2021 The Chromium OS Authors # SPDX-License-Identifier: Apache-2.0 config BOARD_STM32G071B_DISCO - bool "STM32G071B Discovery Board" - depends on SOC_STM32G071XX + select SOC_STM32G071XX diff --git a/boards/boards_legacy/arm/stm32g071b_disco/board.cmake b/boards/st/stm32g071b_disco/board.cmake similarity index 100% rename from boards/boards_legacy/arm/stm32g071b_disco/board.cmake rename to boards/st/stm32g071b_disco/board.cmake diff --git a/boards/st/stm32g071b_disco/board.yml b/boards/st/stm32g071b_disco/board.yml new file mode 100644 index 00000000000000..5445391255f9c7 --- /dev/null +++ b/boards/st/stm32g071b_disco/board.yml @@ -0,0 +1,5 @@ +board: + name: stm32g071b_disco + vendor: st + socs: + - name: stm32g071xx diff --git a/boards/boards_legacy/arm/stm32g071b_disco/doc/img/stm32g071b_disco.jpg b/boards/st/stm32g071b_disco/doc/img/stm32g071b_disco.jpg similarity index 100% rename from boards/boards_legacy/arm/stm32g071b_disco/doc/img/stm32g071b_disco.jpg rename to boards/st/stm32g071b_disco/doc/img/stm32g071b_disco.jpg diff --git a/boards/boards_legacy/arm/stm32g071b_disco/doc/index.rst b/boards/st/stm32g071b_disco/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/stm32g071b_disco/doc/index.rst rename to boards/st/stm32g071b_disco/doc/index.rst diff --git a/boards/boards_legacy/arm/stm32g071b_disco/stm32g071b_disco.dts b/boards/st/stm32g071b_disco/stm32g071b_disco.dts similarity index 100% rename from boards/boards_legacy/arm/stm32g071b_disco/stm32g071b_disco.dts rename to boards/st/stm32g071b_disco/stm32g071b_disco.dts diff --git a/boards/boards_legacy/arm/stm32g071b_disco/stm32g071b_disco.yaml b/boards/st/stm32g071b_disco/stm32g071b_disco.yaml similarity index 100% rename from boards/boards_legacy/arm/stm32g071b_disco/stm32g071b_disco.yaml rename to boards/st/stm32g071b_disco/stm32g071b_disco.yaml diff --git a/boards/boards_legacy/arm/stm32g071b_disco/stm32g071b_disco_defconfig b/boards/st/stm32g071b_disco/stm32g071b_disco_defconfig similarity index 85% rename from boards/boards_legacy/arm/stm32g071b_disco/stm32g071b_disco_defconfig rename to boards/st/stm32g071b_disco/stm32g071b_disco_defconfig index c4129b26a7fb38..2554c25669715e 100644 --- a/boards/boards_legacy/arm/stm32g071b_disco/stm32g071b_disco_defconfig +++ b/boards/st/stm32g071b_disco/stm32g071b_disco_defconfig @@ -2,9 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32G0X=y -CONFIG_SOC_STM32G071XX=y - # Serial Drivers CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y diff --git a/boards/boards_legacy/arm/stm32g081b_eval/Kconfig.board b/boards/st/stm32g081b_eval/Kconfig.stm32g081b_eval similarity index 50% rename from boards/boards_legacy/arm/stm32g081b_eval/Kconfig.board rename to boards/st/stm32g081b_eval/Kconfig.stm32g081b_eval index 2f2299670f5209..0448edcd135d92 100644 --- a/boards/boards_legacy/arm/stm32g081b_eval/Kconfig.board +++ b/boards/st/stm32g081b_eval/Kconfig.stm32g081b_eval @@ -1,8 +1,5 @@ -# STM32G081B Evaluation board configuration - # Copyright 2021 The Chromium OS Authors # SPDX-License-Identifier: Apache-2.0 config BOARD_STM32G081B_EVAL - bool "STM32G081B Evaluation Board" - depends on SOC_STM32G081XX + select SOC_STM32G081XX diff --git a/boards/boards_legacy/arm/stm32g081b_eval/board.cmake b/boards/st/stm32g081b_eval/board.cmake similarity index 100% rename from boards/boards_legacy/arm/stm32g081b_eval/board.cmake rename to boards/st/stm32g081b_eval/board.cmake diff --git a/boards/st/stm32g081b_eval/board.yml b/boards/st/stm32g081b_eval/board.yml new file mode 100644 index 00000000000000..5cdb22ef9b8754 --- /dev/null +++ b/boards/st/stm32g081b_eval/board.yml @@ -0,0 +1,5 @@ +board: + name: stm32g081b_eval + vendor: st + socs: + - name: stm32g081xx diff --git a/boards/boards_legacy/arm/stm32g081b_eval/doc/img/stm32g081b_eval.jpg b/boards/st/stm32g081b_eval/doc/img/stm32g081b_eval.jpg similarity index 100% rename from boards/boards_legacy/arm/stm32g081b_eval/doc/img/stm32g081b_eval.jpg rename to boards/st/stm32g081b_eval/doc/img/stm32g081b_eval.jpg diff --git a/boards/boards_legacy/arm/stm32g081b_eval/doc/index.rst b/boards/st/stm32g081b_eval/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/stm32g081b_eval/doc/index.rst rename to boards/st/stm32g081b_eval/doc/index.rst diff --git a/boards/boards_legacy/arm/stm32g081b_eval/stm32g081b_eval.dts b/boards/st/stm32g081b_eval/stm32g081b_eval.dts similarity index 100% rename from boards/boards_legacy/arm/stm32g081b_eval/stm32g081b_eval.dts rename to boards/st/stm32g081b_eval/stm32g081b_eval.dts diff --git a/boards/boards_legacy/arm/stm32g081b_eval/stm32g081b_eval.yaml b/boards/st/stm32g081b_eval/stm32g081b_eval.yaml similarity index 100% rename from boards/boards_legacy/arm/stm32g081b_eval/stm32g081b_eval.yaml rename to boards/st/stm32g081b_eval/stm32g081b_eval.yaml diff --git a/boards/boards_legacy/arm/stm32g081b_eval/stm32g081b_eval_defconfig b/boards/st/stm32g081b_eval/stm32g081b_eval_defconfig similarity index 85% rename from boards/boards_legacy/arm/stm32g081b_eval/stm32g081b_eval_defconfig rename to boards/st/stm32g081b_eval/stm32g081b_eval_defconfig index cccb164bbcde7f..2554c25669715e 100644 --- a/boards/boards_legacy/arm/stm32g081b_eval/stm32g081b_eval_defconfig +++ b/boards/st/stm32g081b_eval/stm32g081b_eval_defconfig @@ -2,9 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32G0X=y -CONFIG_SOC_STM32G081XX=y - # Serial Drivers CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.soc b/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.soc deleted file mode 100644 index 592290e2fb9aa9..00000000000000 --- a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.soc +++ /dev/null @@ -1,48 +0,0 @@ -# STMicroelectronics STM32G0 MCU line - -# Copyright (c) 2019 Philippe Retornaz -# Copyright (c) 2019 STMicroelectronics -# Copyright (c) 2020 Thomas Stranger -# SPDX-License-Identifier: Apache-2.0 - -choice - prompt "STM32G0x MCU Selection" - depends on SOC_SERIES_STM32G0X - -config SOC_STM32G030XX - bool "STM32G030XX" - -config SOC_STM32G031XX - bool "STM32G031XX" - -config SOC_STM32G041XX - bool "STM32G041XX" - -config SOC_STM32G050XX - bool "STM32G050XX" - -config SOC_STM32G051XX - bool "STM32G051XX" - -config SOC_STM32G061XX - bool "STM32G061XX" - -config SOC_STM32G070XX - bool "STM32G070XX" - -config SOC_STM32G071XX - bool "STM32G071XX" - -config SOC_STM32G081XX - bool "STM32G081XX" - -config SOC_STM32G0B0XX - bool "STM32G0B0XX" - -config SOC_STM32G0B1XX - bool "STM32G0B1XX" - -config SOC_STM32G0C1XX - bool "STM32G0C1XX" - -endchoice diff --git a/soc/st/stm32/soc.yml b/soc/st/stm32/soc.yml index c7851c3bf64067..b9483d17af83de 100644 --- a/soc/st/stm32/soc.yml +++ b/soc/st/stm32/soc.yml @@ -56,6 +56,20 @@ family: - name: stm32f765xx - name: stm32f767xx - name: stm32f769xx + - name: stm32g0x + socs: + - name: stm32g030xx + - name: stm32g031xx + - name: stm32g041xx + - name: stm32g050xx + - name: stm32g051xx + - name: stm32g061xx + - name: stm32g070xx + - name: stm32g071xx + - name: stm32g081xx + - name: stm32g0b0xx + - name: stm32g0b1xx + - name: stm32g0c1xx - name: stm32l1x socs: - name: stm32l151xb diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/CMakeLists.txt b/soc/st/stm32/stm32g0/CMakeLists.txt similarity index 91% rename from soc/soc_legacy/arm/st_stm32/stm32g0/CMakeLists.txt rename to soc/st/stm32/stm32g0/CMakeLists.txt index 85869a31ddfc6b..65706e73bfa099 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32g0/CMakeLists.txt +++ b/soc/st/stm32/stm32g0/CMakeLists.txt @@ -10,4 +10,6 @@ zephyr_sources_ifdef(CONFIG_PM power.c ) +zephyr_include_directories(.) + set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "") diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.series b/soc/st/stm32/stm32g0/Kconfig similarity index 78% rename from soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.series rename to soc/st/stm32/stm32g0/Kconfig index acdb926ef61df1..8fac199d153de0 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.series +++ b/soc/st/stm32/stm32g0/Kconfig @@ -5,14 +5,10 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32G0X - bool "STM32G0x Series MCU" select ARM select CPU_CORTEX_M0PLUS select CPU_CORTEX_M_HAS_VTOR select CPU_HAS_ARM_MPU - select SOC_FAMILY_STM32 select HAS_STM32CUBE select CPU_CORTEX_M_HAS_SYSTICK select HAS_PM - help - Enable support for STM32G0 MCU series diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.series b/soc/st/stm32/stm32g0/Kconfig.defconfig similarity index 71% rename from soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.series rename to soc/st/stm32/stm32g0/Kconfig.defconfig index 0c5d11beef70ab..e4978d0cfe483f 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.series +++ b/soc/st/stm32/stm32g0/Kconfig.defconfig @@ -7,9 +7,6 @@ if SOC_SERIES_STM32G0X -source "soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g0*" - -config SOC_SERIES - default "stm32g0" +rsource "Kconfig.defconfig.stm32g0*" endif # SOC_SERIES_STM32G0X diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g030xx b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g030xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g030xx rename to soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g030xx index c72bb7058660e7..4800b2584f58c1 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g030xx +++ b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g030xx @@ -5,9 +5,6 @@ if SOC_STM32G030XX -config SOC - default "stm32g030xx" - config NUM_IRQS default 29 diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g031xx b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g031xx similarity index 83% rename from soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g031xx rename to soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g031xx index 9b7236b98533dc..d6890a5b3727f5 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g031xx +++ b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g031xx @@ -5,9 +5,6 @@ if SOC_STM32G031XX -config SOC - default "stm32g031xx" - config NUM_IRQS default 30 diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g041xx b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g041xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g041xx rename to soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g041xx index dc63f9e2520246..327f7a42261c36 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g041xx +++ b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g041xx @@ -5,9 +5,6 @@ if SOC_STM32G041XX -config SOC - default "stm32g041xx" - config NUM_IRQS default 32 diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g050xx b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g050xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g050xx rename to soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g050xx index f2e1592504685b..efaab9634cce94 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g050xx +++ b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g050xx @@ -5,9 +5,6 @@ if SOC_STM32G050XX -config SOC - default "stm32g050xx" - config NUM_IRQS default 29 diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g051xx b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g051xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g051xx rename to soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g051xx index 67a06d1c13905f..88177fb506f44a 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g051xx +++ b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g051xx @@ -5,9 +5,6 @@ if SOC_STM32G051XX -config SOC - default "stm32g051xx" - config NUM_IRQS default 30 diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g061xx b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g061xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g061xx rename to soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g061xx index 4d052632eb6a2d..b81c12efefa0a8 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g061xx +++ b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g061xx @@ -5,9 +5,6 @@ if SOC_STM32G061XX -config SOC - default "stm32g061xx" - config NUM_IRQS default 32 diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g070xx b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g070xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g070xx rename to soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g070xx index d7eb915534f16d..502dfe952fb75e 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g070xx +++ b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g070xx @@ -5,9 +5,6 @@ if SOC_STM32G070XX -config SOC - default "stm32g070xx" - config NUM_IRQS default 30 diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g071xx b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g071xx similarity index 87% rename from soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g071xx rename to soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g071xx index a1814043d4d222..3c953d99823229 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g071xx +++ b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g071xx @@ -6,9 +6,6 @@ if SOC_STM32G071XX -config SOC - default "stm32g071xx" - config NUM_IRQS default 31 diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g081xx b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g081xx similarity index 86% rename from soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g081xx rename to soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g081xx index ab46bc38c9d9d1..f308c47e668fa6 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g081xx +++ b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g081xx @@ -6,9 +6,6 @@ if SOC_STM32G081XX -config SOC - default "stm32g081xx" - config NUM_IRQS default 32 diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g0b0xx b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g0b0xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g0b0xx rename to soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g0b0xx index 3be972e356ab81..02829267715db8 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g0b0xx +++ b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g0b0xx @@ -5,9 +5,6 @@ if SOC_STM32G0B0XX -config SOC - default "stm32g0b0xx" - config NUM_IRQS default 30 diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g0b1xx b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g0b1xx similarity index 90% rename from soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g0b1xx rename to soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g0b1xx index 767cea2556cd77..9a226fc0ad7332 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g0b1xx +++ b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g0b1xx @@ -5,9 +5,6 @@ if SOC_STM32G0B1XX -config SOC - default "stm32g0b1xx" - config NUM_IRQS default 31 diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g0c1xx b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g0c1xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g0c1xx rename to soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g0c1xx index fed2a1f09328fb..0e1e696b72a425 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g0c1xx +++ b/soc/st/stm32/stm32g0/Kconfig.defconfig.stm32g0c1xx @@ -5,9 +5,6 @@ if SOC_STM32G0C1XX -config SOC - default "stm32g0c1xx" - config NUM_IRQS default 32 diff --git a/soc/st/stm32/stm32g0/Kconfig.soc b/soc/st/stm32/stm32g0/Kconfig.soc new file mode 100644 index 00000000000000..88729eab261fe8 --- /dev/null +++ b/soc/st/stm32/stm32g0/Kconfig.soc @@ -0,0 +1,75 @@ +# STMicroelectronics STM32G0 MCU line + +# Copyright (c) 2019 Philippe Retornaz +# Copyright (c) 2019 STMicroelectronics +# Copyright (c) 2020 Thomas Stranger +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_STM32G0X + bool + select SOC_FAMILY_STM32 + +config SOC_SERIES + default "stm32g0" if SOC_SERIES_STM32G0X + +config SOC_STM32G030XX + bool + select SOC_SERIES_STM32G0X + +config SOC_STM32G031XX + bool + select SOC_SERIES_STM32G0X + +config SOC_STM32G041XX + bool + select SOC_SERIES_STM32G0X + +config SOC_STM32G050XX + bool + select SOC_SERIES_STM32G0X + +config SOC_STM32G051XX + bool + select SOC_SERIES_STM32G0X + +config SOC_STM32G061XX + bool + select SOC_SERIES_STM32G0X + +config SOC_STM32G070XX + bool + select SOC_SERIES_STM32G0X + +config SOC_STM32G071XX + bool + select SOC_SERIES_STM32G0X + +config SOC_STM32G081XX + bool + select SOC_SERIES_STM32G0X + +config SOC_STM32G0B0XX + bool + select SOC_SERIES_STM32G0X + +config SOC_STM32G0B1XX + bool + select SOC_SERIES_STM32G0X + +config SOC_STM32G0C1XX + bool + select SOC_SERIES_STM32G0X + +config SOC + default "stm32g030xx" if SOC_STM32G030XX + default "stm32g031xx" if SOC_STM32G031XX + default "stm32g041xx" if SOC_STM32G041XX + default "stm32g050xx" if SOC_STM32G050XX + default "stm32g051xx" if SOC_STM32G051XX + default "stm32g061xx" if SOC_STM32G061XX + default "stm32g070xx" if SOC_STM32G070XX + default "stm32g071xx" if SOC_STM32G071XX + default "stm32g081xx" if SOC_STM32G081XX + default "stm32g0b0xx" if SOC_STM32G0B0XX + default "stm32g0b1xx" if SOC_STM32G0B1XX + default "stm32g0c1xx" if SOC_STM32G0C1XX diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/power.c b/soc/st/stm32/stm32g0/power.c similarity index 100% rename from soc/soc_legacy/arm/st_stm32/stm32g0/power.c rename to soc/st/stm32/stm32g0/power.c diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/soc.c b/soc/st/stm32/stm32g0/soc.c similarity index 100% rename from soc/soc_legacy/arm/st_stm32/stm32g0/soc.c rename to soc/st/stm32/stm32g0/soc.c diff --git a/soc/soc_legacy/arm/st_stm32/stm32g0/soc.h b/soc/st/stm32/stm32g0/soc.h similarity index 100% rename from soc/soc_legacy/arm/st_stm32/stm32g0/soc.h rename to soc/st/stm32/stm32g0/soc.h