diff --git a/configs/pulpissimo_cv32e40p.sh b/configs/pulpissimo_cv32.sh similarity index 94% rename from configs/pulpissimo_cv32e40p.sh rename to configs/pulpissimo_cv32.sh index 33820d1..d366e9b 100644 --- a/configs/pulpissimo_cv32e40p.sh +++ b/configs/pulpissimo_cv32.sh @@ -5,6 +5,7 @@ export PULPRUN_TARGET=pulpissimo export USE_CV32E40P=1 # use plusarg to pass simulation boot parameters instead of floating parameters export CONFIG_PLUSARG_SIM=1 +unset CONFIG_USE_ZFINX if [ -n "${ZSH_VERSION:-}" ]; then DIR="$(readlink -f -- "${(%):-%x}")" diff --git a/configs/pulpissimo_cv32_zfinx.sh b/configs/pulpissimo_cv32_zfinx.sh new file mode 100644 index 0000000..bb80583 --- /dev/null +++ b/configs/pulpissimo_cv32_zfinx.sh @@ -0,0 +1,19 @@ +#!/bin/bash -e + +export PULPRT_TARGET=pulpissimo +export PULPRUN_TARGET=pulpissimo +export USE_CV32E40P=1 +# use plusarg to pass simulation boot parameters instead of floating parameters +export CONFIG_PLUSARG_SIM=1 +export CONFIG_USE_ZFINX=1 + +if [ -n "${ZSH_VERSION:-}" ]; then + DIR="$(readlink -f -- "${(%):-%x}")" + scriptDir="$(dirname $DIR)" +else + + scriptDir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" + +fi + +source $scriptDir/common.sh diff --git a/rules/pulpos/targets/pulpissimo.mk b/rules/pulpos/targets/pulpissimo.mk index f2aafc6..79492b0 100644 --- a/rules/pulpos/targets/pulpissimo.mk +++ b/rules/pulpos/targets/pulpissimo.mk @@ -7,9 +7,14 @@ PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imc else ifdef USE_CV32E40P PULP_LDFLAGS += PULP_CFLAGS += -D__cv32e40p__ -U__riscv__ -UARCHI_CORE_HAS_PULPV2 -PULP_ARCH_CFLAGS ?= -march=rv32imcxgap9 -PULP_ARCH_LDFLAGS ?= -march=rv32imcxgap9 -PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imcxgap9 +ifdef CONFIG_USE_ZFINX +PULP_ARCH_CFLAGS ?= -march=rv32imc_zfinx_xcorev -mno-pulp-hwloop +PULP_ARCH_LDFLAGS ?= -march=rv32imc_zfinx_xcorev -mno-pulp-hwloop +else +PULP_ARCH_CFLAGS ?= -march=rv32imfc_xcorev -mno-pulp-hwloop +PULP_ARCH_LDFLAGS ?= -march=rv32imfc_xcorev -mno-pulp-hwloop +endif +PULP_ARCH_OBJDFLAGS ?= else PULP_LDFLAGS += PULP_CFLAGS += -D__riscv__