From a40ceff540bdf526ed37b162835f8f411421a120 Mon Sep 17 00:00:00 2001 From: Lorenzo Leone Date: Fri, 27 Sep 2024 07:58:39 +0200 Subject: [PATCH] CI: Align CI commit to lleone/hw-sw-switch --- chimera.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/chimera.mk b/chimera.mk index 07b76be..c5d59fd 100644 --- a/chimera.mk +++ b/chimera.mk @@ -4,6 +4,7 @@ # # Moritz Scherer + CLINTCORES = 46 PLICCORES = 92 PLIC_NUM_INTRS = 92 @@ -20,7 +21,7 @@ gen_idma_hw: CHS_SW_LD_DIR = $(CHIM_ROOT)/sw/link .PHONY: chs-hw-init -chs-hw-init: update_plic gen_idma_hw +chs-hw-init: update_plic gen_idma_hw $(CHIM_SW_LIB) make -B chs-hw-all CHS_XLEN=$(CHS_XLEN) CHS_SW_LD_DIR=$(CHS_SW_LD_DIR) .PHONY: snitch-hw-init @@ -64,7 +65,7 @@ $(CHIM_ROOT)/hw/regs/chimera_reg_pkg.sv $(CHIM_ROOT)/hw/regs/chimera_reg_top.sv: # Nonfree components CHIM_NONFREE_REMOTE ?= git@iis-git.ee.ethz.ch:pulp-restricted/chimera-nonfree.git CHIM_NONFREE_DIR ?= $(CHIM_ROOT)/nonfree -CHIM_NONFREE_COMMIT ?= deploy # to deploy `chimera-nonfree` repo changes, push to `deploy` tag +CHIM_NONFREE_COMMIT ?= 0825231dfb56fb1ab387d86c4b13bcad7c2fbee9 # to deploy `chimera-nonfree` repo changes, push to `deploy` tag .PHONY: chim-nonfree-init chim-nonfree-init: @@ -75,8 +76,11 @@ chim-nonfree-init: -include $(CHIM_ROOT)/bender.mk -# Include subdir Makefiles +# Necessary to build libchimera.a for bootrom.elf +# TODO: Here the make chim-sw cannot work properly FIND SOLUTION !!!!! -include $(CHIM_ROOT)/sw/sw.mk + +# Include subdir Makefiles -include $(CHIM_ROOT)/utils/utils.mk # Include target makefiles -include $(CHIM_ROOT)/target/sim/sim.mk