diff --git a/configs/pulpissimo.sh b/configs/pulpissimo.sh index 2882987..d509e06 100644 --- a/configs/pulpissimo.sh +++ b/configs/pulpissimo.sh @@ -3,7 +3,7 @@ export PULPRT_TARGET=pulpissimo export PULPRUN_TARGET=pulpissimo -if [ -n "${ZSH_VERSION:-}" ]; then +if [ -n "${ZSH_VERSION:-}" ]; then DIR="$(readlink -f -- "${(%):-%x}")" scriptDir="$(dirname $DIR)" else diff --git a/configs/pulpissimo_cv32e40p.sh b/configs/pulpissimo_cv32e40p.sh index 0a9b0f4..24a391f 100644 --- a/configs/pulpissimo_cv32e40p.sh +++ b/configs/pulpissimo_cv32e40p.sh @@ -4,7 +4,7 @@ export PULPRT_TARGET=pulpissimo export PULPRUN_TARGET=pulpissimo export USE_CV32E40P=1 -if [ -n "${ZSH_VERSION:-}" ]; then +if [ -n "${ZSH_VERSION:-}" ]; then DIR="$(readlink -f -- "${(%):-%x}")" scriptDir="$(dirname $DIR)" else diff --git a/rules/pulpos/targets/pulpissimo.mk b/rules/pulpos/targets/pulpissimo.mk index 25ed391..f2aafc6 100644 --- a/rules/pulpos/targets/pulpissimo.mk +++ b/rules/pulpos/targets/pulpissimo.mk @@ -5,24 +5,24 @@ PULP_ARCH_CFLAGS ?= -march=rv32imc PULP_ARCH_LDFLAGS ?= -march=rv32imc 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 -else -PULP_LDFLAGS += -PULP_CFLAGS += -D__riscv__ -PULP_ARCH_CFLAGS ?= -march=rv32imcxgap9 +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 +PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imcxgap9 +else +PULP_LDFLAGS += +PULP_CFLAGS += -D__riscv__ +PULP_ARCH_CFLAGS ?= -march=rv32imcxgap9 +PULP_ARCH_LDFLAGS ?= -march=rv32imcxgap9 +PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imcxgap9 endif PULP_CFLAGS += -fdata-sections -ffunction-sections -include chips/pulpissimo/config.h -I$(PULPRT_HOME)/include/chips/pulpissimo PULP_OMP_CFLAGS += -fopenmp -mnativeomp PULP_LDFLAGS += -nostartfiles -nostdlib -Wl,--gc-sections -L$(PULPRT_HOME)/kernel -Tchips/pulpissimo/link.ld -lgcc -PULP_CC = riscv32-unknown-elf-gcc +PULP_CC = riscv32-unknown-elf-gcc PULP_AR ?= riscv32-unknown-elf-ar PULP_LD ?= riscv32-unknown-elf-gcc PULP_OBJDUMP ?= riscv32-unknown-elf-objdump