michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc: renesas: rcar_gen3: Fix Kconfigs

Browse source 
Fixes Kconfigs to not use another SOC_SERIES Kconfig name

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae 2024-03-18 14:45:14 +00:00 • committed by Fabio Baltieri
commit fe8816f278
2 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
soc/renesas/rcar/rcar_gen3/CMakeLists.txt
View file

@ -2,12 +2,12 @@
# Copyright (c) 2023 EPAM Systems # Copyright (c) 2023 EPAM Systems
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
if(CONFIG_SOC_SERIES_RCAR_GEN3_R7) if(CONFIG_ARM)
zephyr_sources(r7/soc.c) zephyr_sources(r7/soc.c)
zephyr_include_directories(r7) zephyr_include_directories(r7)
set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_a_r/scripts/linker.ld CACHE INTERNAL "") 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_include_directories(a57)
zephyr_library_sources_ifdef(CONFIG_ARM_MMU mmu_regions.c) zephyr_library_sources_ifdef(CONFIG_ARM_MMU mmu_regions.c)

21
soc/renesas/rcar/rcar_gen3/Kconfig
View file

@ -1,26 +1,21 @@
# Copyright (c) 2021 IoT.bzh # Copyright (c) 2021 IoT.bzh
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
config SOC_SERIES_RCAR_GEN3_R7 config SOC_SERIES_RCAR_GEN3
bool select CLOCK_CONTROL_RCAR_CPG_MSSR if CLOCK_CONTROL
config SOC_R8A77951_R7
select ARM select ARM
select CPU_CORTEX_R7 select CPU_CORTEX_R7
select PLATFORM_SPECIFIC_INIT select PLATFORM_SPECIFIC_INIT
select CPU_HAS_DCLS select CPU_HAS_DCLS
select CLOCK_CONTROL_RCAR_CPG_MSSR if CLOCK_CONTROL
config SOC_SERIES_RCAR_GEN3_A57 config SOC_R8A77951_A57
bool
select ARM64 select ARM64
select CPU_CORTEX_A57 select CPU_CORTEX_A57
select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS 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 config SOC_R8A77961
select SOC_SERIES_RCAR_GEN3_A57 select ARM64
select CPU_CORTEX_A57
select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS