From 3829557a944b485c5b2343163b18047f8044c730 Mon Sep 17 00:00:00 2001 From: aottaviano Date: Sun, 25 Jul 2021 18:26:50 +0200 Subject: [PATCH 1/2] include/archi: Fixes for I/O in control-pulp --- include/archi/chips/control-pulp/properties.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/include/archi/chips/control-pulp/properties.h b/include/archi/chips/control-pulp/properties.h index 879956b..1f45793 100644 --- a/include/archi/chips/control-pulp/properties.h +++ b/include/archi/chips/control-pulp/properties.h @@ -132,14 +132,12 @@ #define ARCHI_UDMA_UART_ID(id) 0 #define ARCHI_UDMA_SPIM_ID(id) (1 + (id)) #define ARCHI_UDMA_I2C_ID(id) (9 + (id)) -#define ARCHI_UDMA_SDIO_ID(id) (20 + (id)) -#define ARCHI_UDMA_I2S_ID(id) 21 -#define ARCHI_UDMA_CAM_ID(id) 22 -#define ARCHI_UDMA_FILTER_ID(id) (23 + (id)) -#define ARCHI_UDMA_TRACER_ID(id) 24 -#define ARCHI_UDMA_TGEN_ID(id) 25 +#define ARCHI_UDMA_SDIO_ID(id) (21 + (id)) +#define ARCHI_UDMA_FILTER_ID(id) (22 + (id)) +#define ARCHI_UDMA_TRACER_ID(id) 23 +#define ARCHI_UDMA_TGEN_ID(id) 24 -#define ARCHI_NB_PERIPH 26 +#define ARCHI_NB_PERIPH 25 From 863f6009aa3749555da673e88c039b8a58177bf5 Mon Sep 17 00:00:00 2001 From: bluew Date: Tue, 27 Jul 2021 17:53:37 +0200 Subject: [PATCH 2/2] Use zfinx for control-pulp --- rules/pulpos/targets/control-pulp.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rules/pulpos/targets/control-pulp.mk b/rules/pulpos/targets/control-pulp.mk index fd1dedb..4ef042b 100644 --- a/rules/pulpos/targets/control-pulp.mk +++ b/rules/pulpos/targets/control-pulp.mk @@ -2,12 +2,13 @@ ifdef USE_IBEX $(error IBEX is not supported in control-pulp) endif -# we need at least pulp-gcc v2.1.2 +# we need at least pulp-gcc v2.4.0 PULP_LDFLAGS += PULP_CFLAGS += -D__cv32e40p__ -D__riscv__ -PULP_ARCH_CFLAGS ?= -march=rv32imfc_xcorev -mno-pulp-hwloop -PULP_ARCH_LDFLAGS ?= -march=rv32imfc_xcorev -mno-pulp-hwloop -PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imfc_xcorev -mno-pulp-hwloop +PULP_ARCH_CFLAGS ?= -march=rv32imc_zfinx_xcorev -mabi=ilp32 -mno-pulp-hwloop +PULP_ARCH_LDFLAGS ?= -march=rv32imc_zfinx_xcorev -mabi=ilp32 -mno-pulp-hwloop +# uses elf attributes to disassemble so no need to set it manually +PULP_ARCH_OBJDFLAGS ?= PULP_CFLAGS += -fdata-sections -ffunction-sections \ -include chips/pulp/config.h -I$(PULPRT_HOME)/include/chips/control-pulp