michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc/openisa: rely on the CONFIG_RISCV_ISA_EXT_* options for arch string

Browse source 
This commit makes the RV32M1 SoC rely on the default behavior of relying on
the `CONFIG_RISCV_ISA_EXT_*` config options, and removes the
`zephyr_compile_options` override when the standard toolchain is used.

Signed-off-by: Filip Kokosinski <fkokosinski@antmicro.com>
This commit is contained in:
Filip Kokosinski 2024-07-01 10:12:44 +02:00 • committed by Anas Nashif
commit dcc5dd27fa
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
soc/openisa/rv32m1/CMakeLists.txt
View file

@ -2,14 +2,10 @@
#
# SPDX-License-Identifier: Apache-2.0
if(CONFIG_SOC_OPENISA_RV32M1_RI5CY)
if (CONFIG_RISCV_GENERIC_TOOLCHAIN)
zephyr_compile_options(-march=rv32imc_zicsr_zifencei)
else()
zephyr_compile_options(-march=rv32imcxpulpv2)
endif()
elseif(CONFIG_SOC_OPENISA_RV32M1_ZERO_RISCY)
zephyr_compile_options(-march=rv32imc_zicsr_zifencei)
# Let's rely on `-march` being generated by the CMake script based on which `CONFIG_RISCV_ISA_EXT_*`
# options are y-selected; provide full arch string with the custom extension otherwise.
if(CONFIG_SOC_OPENISA_RV32M1_RI5CY AND NOT CONFIG_RISCV_GENERIC_TOOLCHAIN)
zephyr_compile_options(-march=rv32imcxpulpv2)
endif()
zephyr_sources(