From fe8816f27896e528e04513d99a252e731d7900e9 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 18 Mar 2024 14:45:14 +0000 Subject: [PATCH] soc: renesas: rcar_gen3: Fix Kconfigs Fixes Kconfigs to not use another SOC_SERIES Kconfig name Signed-off-by: Jamie McCrae --- soc/renesas/rcar/rcar_gen3/CMakeLists.txt | 4 ++-- soc/renesas/rcar/rcar_gen3/Kconfig | 21 ++++++++------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/soc/renesas/rcar/rcar_gen3/CMakeLists.txt b/soc/renesas/rcar/rcar_gen3/CMakeLists.txt index 421ba3ff258..74c6c567035 100644 --- a/soc/renesas/rcar/rcar_gen3/CMakeLists.txt +++ b/soc/renesas/rcar/rcar_gen3/CMakeLists.txt @@ -2,12 +2,12 @@ # Copyright (c) 2023 EPAM Systems # SPDX-License-Identifier: Apache-2.0 -if(CONFIG_SOC_SERIES_RCAR_GEN3_R7) +if(CONFIG_ARM) zephyr_sources(r7/soc.c) zephyr_include_directories(r7) set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_a_r/scripts/linker.ld CACHE INTERNAL "") -elseif(CONFIG_SOC_SERIES_RCAR_GEN3_A57) +elseif(CONFIG_ARM64) zephyr_include_directories(a57) zephyr_library_sources_ifdef(CONFIG_ARM_MMU mmu_regions.c) diff --git a/soc/renesas/rcar/rcar_gen3/Kconfig b/soc/renesas/rcar/rcar_gen3/Kconfig index 3d4c577e46a..c4bf5a2a161 100644 --- a/soc/renesas/rcar/rcar_gen3/Kconfig +++ b/soc/renesas/rcar/rcar_gen3/Kconfig @@ -1,26 +1,21 @@ # Copyright (c) 2021 IoT.bzh # SPDX-License-Identifier: Apache-2.0 -config SOC_SERIES_RCAR_GEN3_R7 - bool +config SOC_SERIES_RCAR_GEN3 + select CLOCK_CONTROL_RCAR_CPG_MSSR if CLOCK_CONTROL + +config SOC_R8A77951_R7 select ARM select CPU_CORTEX_R7 select PLATFORM_SPECIFIC_INIT select CPU_HAS_DCLS - select CLOCK_CONTROL_RCAR_CPG_MSSR if CLOCK_CONTROL -config SOC_SERIES_RCAR_GEN3_A57 - bool +config SOC_R8A77951_A57 select ARM64 select CPU_CORTEX_A57 select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS - select CLOCK_CONTROL_RCAR_CPG_MSSR if CLOCK_CONTROL - -config SOC_R8A77951_R7 - select SOC_SERIES_RCAR_GEN3_R7 - -config SOC_R8A77951_A57 - select SOC_SERIES_RCAR_GEN3_A57 config SOC_R8A77961 - select SOC_SERIES_RCAR_GEN3_A57 + select ARM64 + select CPU_CORTEX_A57 + select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS