From c4522be374b22f931fc63bc55b048739ba72f91f Mon Sep 17 00:00:00 2001 From: Marc Desvaux Date: Tue, 11 Apr 2023 17:15:24 +0200 Subject: [PATCH] soc: arm: st_stm32: Move STM32H7_DUAL_CORE Move STM32H7_DUAL_CORE to soc/arm/st_stm32/stm32h7/Kconfig.soc add select STM32H7_DUAL_CORE for SOC_STM32H745XX/H747XX Cleanup old occurences where was set to y Signed-off-by: Marc Desvaux --- boards/arm/arduino_giga_r1/Kconfig.defconfig | 3 --- boards/arm/arduino_portenta_h7/Kconfig.defconfig | 3 --- boards/arm/nucleo_h745zi_q/Kconfig.defconfig | 3 --- boards/arm/stm32h747i_disco/Kconfig.defconfig | 3 --- soc/arm/st_stm32/stm32h7/Kconfig.series | 4 ---- soc/arm/st_stm32/stm32h7/Kconfig.soc | 6 ++++++ 6 files changed, 6 insertions(+), 16 deletions(-) diff --git a/boards/arm/arduino_giga_r1/Kconfig.defconfig b/boards/arm/arduino_giga_r1/Kconfig.defconfig index e5150bffec8..5880f88f7e0 100644 --- a/boards/arm/arduino_giga_r1/Kconfig.defconfig +++ b/boards/arm/arduino_giga_r1/Kconfig.defconfig @@ -7,9 +7,6 @@ config BOARD default "arduino_giga_r1_m7" if BOARD_ARDUINO_GIGA_R1_M7 default "arduino_giga_r1_m4" if BOARD_ARDUINO_GIGA_R1_M4 -config STM32H7_DUAL_CORE - default y - if BT choice CYW43XXX_PART diff --git a/boards/arm/arduino_portenta_h7/Kconfig.defconfig b/boards/arm/arduino_portenta_h7/Kconfig.defconfig index 4b7847cce05..7b537a6e466 100644 --- a/boards/arm/arduino_portenta_h7/Kconfig.defconfig +++ b/boards/arm/arduino_portenta_h7/Kconfig.defconfig @@ -9,7 +9,4 @@ config BOARD default "arduino_portenta_h7_m7" if BOARD_ARDUINO_PORTENTA_H7_M7 default "arduino_portenta_h7_m4" if BOARD_ARDUINO_PORTENTA_H7_M4 -config STM32H7_DUAL_CORE - default y - endif # BOARD_ARDUINO_PORTENTA_H7_M7 || BOARD_ARDUINO_PORTENTA_H7_M4 diff --git a/boards/arm/nucleo_h745zi_q/Kconfig.defconfig b/boards/arm/nucleo_h745zi_q/Kconfig.defconfig index 0e572ba7d9d..0d7f628f8ac 100644 --- a/boards/arm/nucleo_h745zi_q/Kconfig.defconfig +++ b/boards/arm/nucleo_h745zi_q/Kconfig.defconfig @@ -9,9 +9,6 @@ config BOARD default "nucleo_h745zi_q_m7" if BOARD_NUCLEO_H745ZI_Q_M7 default "nucleo_h745zi_q_m4" if BOARD_NUCLEO_H745ZI_Q_M4 -config STM32H7_DUAL_CORE - default y - if NETWORKING config NET_L2_ETHERNET diff --git a/boards/arm/stm32h747i_disco/Kconfig.defconfig b/boards/arm/stm32h747i_disco/Kconfig.defconfig index c8fa55a2e37..b9c3ba7161a 100644 --- a/boards/arm/stm32h747i_disco/Kconfig.defconfig +++ b/boards/arm/stm32h747i_disco/Kconfig.defconfig @@ -9,9 +9,6 @@ config BOARD default "stm32h747i_disco_m7" if BOARD_STM32H747I_DISCO_M7 default "stm32h747i_disco_m4" if BOARD_STM32H747I_DISCO_M4 -config STM32H7_DUAL_CORE - default y - if NETWORKING config NET_L2_ETHERNET diff --git a/soc/arm/st_stm32/stm32h7/Kconfig.series b/soc/arm/st_stm32/stm32h7/Kconfig.series index 719e97ce8db..061a23856c2 100644 --- a/soc/arm/st_stm32/stm32h7/Kconfig.series +++ b/soc/arm/st_stm32/stm32h7/Kconfig.series @@ -16,7 +16,3 @@ config SOC_SERIES_STM32H7X select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS help Enable support for STM32H7 MCU series - -config STM32H7_DUAL_CORE - bool "Dual Core" - depends on SOC_SERIES_STM32H7X diff --git a/soc/arm/st_stm32/stm32h7/Kconfig.soc b/soc/arm/st_stm32/stm32h7/Kconfig.soc index b1d508e285a..46f101f0e14 100644 --- a/soc/arm/st_stm32/stm32h7/Kconfig.soc +++ b/soc/arm/st_stm32/stm32h7/Kconfig.soc @@ -5,6 +5,10 @@ # Copyright (c) 2021 Electrolance Solutions # SPDX-License-Identifier: Apache-2.0 +config STM32H7_DUAL_CORE + bool "Dual Core" + depends on SOC_SERIES_STM32H7X + choice prompt "STM32H7x MCU Selection" depends on SOC_SERIES_STM32H7X @@ -42,10 +46,12 @@ config SOC_STM32H743XX config SOC_STM32H745XX bool "STM32H745XX" select CPU_HAS_FPU_DOUBLE_PRECISION if CPU_CORTEX_M7 + select STM32H7_DUAL_CORE config SOC_STM32H747XX bool "STM32H747XX" select CPU_HAS_FPU_DOUBLE_PRECISION if CPU_CORTEX_M7 + select STM32H7_DUAL_CORE config SOC_STM32H750XX bool "STM32H750XX"