diff --git a/Bender.lock b/Bender.lock index dc847ee..f5e9f70 100644 --- a/Bender.lock +++ b/Bender.lock @@ -202,7 +202,7 @@ packages: - common_cells - register_interface kulcluster: - revision: 6ecccdbe71edbbde6a5bf149938065369616c96e + revision: adb033bf1cceeebf7456eb19bfed3f699d7fafe4 version: null source: Git: git@gitlab.tue.nl:es/convolve-private/kulcluster.git diff --git a/Bender.yml b/Bender.yml index facd56d..7965368 100644 --- a/Bender.yml +++ b/Bender.yml @@ -22,7 +22,7 @@ dependencies: TUEDCIM: { git: "git@gitlab.tue.nl:es/convolve-private/tuedcim.git", rev: 22112024-2} TUEMEGA: { git: "git@gitlab.tue.nl:es/convolve-private/tuemega.git", rev: 11102024} TUDDCIM: { git: "git@gitlab.tue.nl:es/convolve-private/tuddcim.git", rev: 04122024-2} - KULCLUSTER: { git: "git@gitlab.tue.nl:es/convolve-private/kulcluster.git", rev: 29112024} + KULCLUSTER: { git: "git@gitlab.tue.nl:es/convolve-private/kulcluster.git", rev: 04122024-2} ETHCluster: { git: "git@gitlab.tue.nl:es/convolve-private/ethcluster.git", rev: 31102024-3} export_include_dirs: diff --git a/chimera.mk b/chimera.mk index 444a5d3..8e41a5d 100644 --- a/chimera.mk +++ b/chimera.mk @@ -6,9 +6,9 @@ # Lorenzo Leone -CLINTCORES = 19 -PLICCORES = 38 -PLIC_NUM_INTRS = 38 +CLINTCORES = 18 +PLICCORES = 36 +PLIC_NUM_INTRS = 36 .PHONY: update_plic diff --git a/hw/chimera_pkg.sv b/hw/chimera_pkg.sv index 90404d4..6299c25 100644 --- a/hw/chimera_pkg.sv +++ b/hw/chimera_pkg.sv @@ -36,7 +36,7 @@ package chimera_pkg; localparam cluster_config_t ChimeraClusterCfg = '{ hasWideMasterPort: {1'b1, 1'b1, 1'b1, 1'b1, 1'b1}, - NrCores: {8'h9, 8'h3, 8'h2, 8'h2, 8'h2} + NrCores: {8'h9, 8'h2, 8'h2, 8'h2, 8'h2} }; function automatic int _sumVector(byte_bt [iomsb(ExtClusters):0] vector, int vectorLen); diff --git a/sw/include/soc_addr_map.h b/sw/include/soc_addr_map.h index bdd175f..a1d5e1c 100644 --- a/sw/include/soc_addr_map.h +++ b/sw/include/soc_addr_map.h @@ -23,7 +23,7 @@ #define CLUSTER_0_NUMCORES 2 #define CLUSTER_1_NUMCORES 2 #define CLUSTER_2_NUMCORES 2 -#define CLUSTER_3_NUMCORES 3 +#define CLUSTER_3_NUMCORES 2 #define CLUSTER_4_NUMCORES 9 static uint8_t _chimera_numCores[] = {CLUSTER_0_NUMCORES, CLUSTER_1_NUMCORES, CLUSTER_2_NUMCORES,