From 466a322f14d38c4bd0891f7560385fe59cbf3002 Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Fri, 19 Apr 2024 09:41:45 -0700 Subject: [PATCH] soc: adi: max32: Refactor core configuration Refactors the max32 soc family configuration to allow socs with cores other than arm cortex-m4. This will make it possible to add support for the secondary risc-v core that exists on some max32 variants. Signed-off-by: Maureen Helm --- soc/adi/max32/Kconfig | 37 +++++-------------------------------- soc/adi/max32/Kconfig.soc | 24 ++++++++++++++---------- 2 files changed, 19 insertions(+), 42 deletions(-) diff --git a/soc/adi/max32/Kconfig b/soc/adi/max32/Kconfig index b44e71c1afe..87b94d0801d 100644 --- a/soc/adi/max32/Kconfig +++ b/soc/adi/max32/Kconfig @@ -4,44 +4,17 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_FAMILY_MAX32 - select ARM - select CPU_HAS_ARM_MPU - select CPU_HAS_FPU - select CPU_CORTEX_M_HAS_SYSTICK select CLOCK_CONTROL select BUILD_OUTPUT_HEX select SOC_EARLY_INIT_HOOK select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE -config SOC_MAX32655 - select CPU_CORTEX_M4 - -config SOC_MAX32662 - select CPU_CORTEX_M4 - -config SOC_MAX32666 - select CPU_CORTEX_M4 - -config SOC_MAX32670 - select CPU_CORTEX_M4 - -config SOC_MAX32672 - select CPU_CORTEX_M4 - -config SOC_MAX32675 - select CPU_CORTEX_M4 - -config SOC_MAX32680 - select CPU_CORTEX_M4 - -config SOC_MAX32690 - select CPU_CORTEX_M4 - -config SOC_MAX78000_M4 - select CPU_CORTEX_M4 - -config SOC_MAX78002_M4 +config SOC_FAMILY_MAX32_M4 + select ARM select CPU_CORTEX_M4 + select CPU_CORTEX_M_HAS_SYSTICK + select CPU_HAS_ARM_MPU + select CPU_HAS_FPU if SOC_FAMILY_MAX32 diff --git a/soc/adi/max32/Kconfig.soc b/soc/adi/max32/Kconfig.soc index 48b2e0d1c8d..b269a521b5c 100644 --- a/soc/adi/max32/Kconfig.soc +++ b/soc/adi/max32/Kconfig.soc @@ -6,72 +6,76 @@ config SOC_FAMILY_MAX32 bool +config SOC_FAMILY_MAX32_M4 + bool + select SOC_FAMILY_MAX32 + config SOC_FAMILY default "max32" if SOC_FAMILY_MAX32 config SOC_MAX32655 bool - select SOC_FAMILY_MAX32 config SOC_MAX32655_M4 bool select SOC_MAX32655 + select SOC_FAMILY_MAX32_M4 config SOC_MAX32662 bool - select SOC_FAMILY_MAX32 + select SOC_FAMILY_MAX32_M4 config SOC_MAX32666 bool - select SOC_FAMILY_MAX32 config SOC_MAX32666_CPU0 bool select SOC_MAX32666 + select SOC_FAMILY_MAX32_M4 config SOC_MAX32670 bool - select SOC_FAMILY_MAX32 + select SOC_FAMILY_MAX32_M4 config SOC_MAX32672 bool - select SOC_FAMILY_MAX32 + select SOC_FAMILY_MAX32_M4 config SOC_MAX32675 bool - select SOC_FAMILY_MAX32 + select SOC_FAMILY_MAX32_M4 config SOC_MAX32680 bool - select SOC_FAMILY_MAX32 config SOC_MAX32680_M4 bool select SOC_MAX32680 + select SOC_FAMILY_MAX32_M4 config SOC_MAX32690 bool - select SOC_FAMILY_MAX32 config SOC_MAX32690_M4 bool select SOC_MAX32690 + select SOC_FAMILY_MAX32_M4 config SOC_MAX78000 bool - select SOC_FAMILY_MAX32 config SOC_MAX78000_M4 bool select SOC_MAX78000 + select SOC_FAMILY_MAX32_M4 config SOC_MAX78002 bool - select SOC_FAMILY_MAX32 config SOC_MAX78002_M4 bool select SOC_MAX78002 + select SOC_FAMILY_MAX32_M4 config SOC default "max32655" if SOC_MAX32655