Extend parametrization to compiled software and initialized hardware.

Bender.local

@@ -7,14 +7,14 @@ overrides:
   axi_riscv_atomics:    { git: https://github.com/pulp-platform/axi_riscv_atomics.git     , version: 0.8.2 }
   apb:                  { git: "https://github.com/pulp-platform/apb.git"                 , version: 0.2.3 }
   redundancy_cells:     { git: "https://github.com/pulp-platform/redundancy_cells.git"    , rev: "c37bdb47339bf70e8323de8df14ea8bbeafb6583" } # branch: astral-rebase
-  hci:                  { git: "https://github.com/pulp-platform/hci.git"                 , rev: v1.1 }
+  hci:                  { git: "https://github.com/pulp-platform/hci.git"                 , rev: e47627c20b33bcaf4842c1add81fb888b4f12a9d   } # branch: old commit in v2.0.0
   tech_cells_generic:   { git: "https://github.com/pulp-platform/tech_cells_generic.git"  , version: =0.2.13                                }
   riscv-dbg:            { git: "https://github.com/pulp-platform/riscv-dbg.git"           , version: =0.8.0                                 }
   idma:                 { git: "https://github.com/pulp-platform/idma.git"                , version: 0.5.1                                  }
   hier-icache:          { git: "https://github.com/pulp-platform/hier-icache.git"         , rev: 2886cb2a46cea3e2bd2d979b505d88fadfbe150c   } # branch: astral
   scm:                  { git: "https://github.com/pulp-platform/scm.git"                 , rev: 74426dee36f28ae1c02f7635cf844a0156145320   }
   cluster_interconnect: { git: "https://github.com/pulp-platform/cluster_interconnect.git", rev: 89e1019d64a86425211be6200770576cbdf3e8b3   } # branch: assertion-fix
-  clic:                 { git: "https://github.com/pulp-platform/clic.git"                , rev: 0ff9f07e0a492bff046dfe24399b1e1e82d557b7   } # branch: balasr/dev-2
+  clic:                 { git: "https://github.com/pulp-platform/clic.git"                , rev: 40ae266dab5768f63ca8dabe70e7474feb403bab   } # branch: critical-path
   fpnew:                { git: "https://github.com/pulp-platform/cvfpu.git"               , rev: pulp-v0.1.3 }
   cv32e40p:             { git: "https://github.com/pulp-platform/cv32e40p.git"            , rev: e863f576699815b38cc9d80dbdede8ed5efd5991   }
   axi_rt:               { git: "https://github.com/pulp-platform/axi_rt.git"              , version: =0.0.0-alpha.4                         }

Bender.lock

@@ -106,7 +106,7 @@ packages:
       Git: https://github.com/AlSaqr-platform/can_bus.git
     dependencies: []
   cheshire:
-    revision: 6d389373df6b54c09888f89411b7e231d2430722
+    revision: cc1ca617df246f7aae7ef76d5a3277e44b974ed6
     version: null
     source:
       Git: https://github.com/pulp-platform/cheshire.git
@@ -132,8 +132,8 @@ packages:
     - tagger
     - unbent
   clic:
-    revision: 0ff9f07e0a492bff046dfe24399b1e1e82d557b7
-    version: 3.0.0-for-carfield
+    revision: 40ae266dab5768f63ca8dabe70e7474feb403bab
+    version: null
     source:
       Git: https://github.com/pulp-platform/clic.git
     dependencies:
@@ -155,15 +155,15 @@ packages:
     dependencies:
     - common_cells
   cluster_peripherals:
-    revision: c9defcfb4f4e8733383b28a451c430783c2febbd
+    revision: 8a9f62dafb5ec23c6cd361847ff0047e12befca4
     version: null
     source:
       Git: https://github.com/pulp-platform/cluster_peripherals.git
     dependencies:
     - hci
   common_cells:
-    revision: ad22699793d98ef714f120c6268fe92d096a61e1
-    version: 1.33.1
+    revision: 7773d971b9d7bef7f5f6a2ef36ee1e4d02cefcd3
+    version: 1.34.0
     source:
       Git: https://github.com/pulp-platform/common_cells.git
     dependencies:
@@ -231,7 +231,7 @@ packages:
     dependencies:
     - common_cells
   hci:
-    revision: 4823e503851eb7e8cc765a58621d767a01d6a77b
+    revision: e47627c20b33bcaf4842c1add81fb888b4f12a9d
     version: null
     source:
       Git: https://github.com/pulp-platform/hci.git
@@ -252,15 +252,15 @@ packages:
     - scm
     - tech_cells_generic
   hwpe-ctrl:
-    revision: b7857919ea14b586901ff4282ad7749a3d50501e
+    revision: a5966201aeeb988d607accdc55da933a53c6a56e
     version: null
     source:
       Git: https://github.com/pulp-platform/hwpe-ctrl.git
     dependencies:
     - tech_cells_generic
   hwpe-stream:
-    revision: bcb4435f802add732f557dc7fa1c6b5dd8854458
-    version: 1.7.1
+    revision: 65c99a4a2f37a79acee800ab0151f67dfb1edef1
+    version: 1.8.0
     source:
       Git: https://github.com/pulp-platform/hwpe-stream.git
     dependencies:
@@ -329,6 +329,16 @@ packages:
       Git: https://github.com/pulp-platform/mchan.git
     dependencies:
     - common_cells
+  neureka:
+    revision: 3131e87c40118f75e11a1ff9bae60fe764336a19
+    version: null
+    source:
+      Git: https://github.com/pulp-platform/neureka.git
+    dependencies:
+    - hci
+    - hwpe-ctrl
+    - hwpe-stream
+    - zeroriscy
   obi:
     revision: 1aa411df145c4ebdd61f8fed4d003c33f7b20636
     version: 0.1.2
@@ -338,12 +348,15 @@ packages:
     - common_cells
     - common_verification
   opentitan:
-    revision: 74e7d6ca17e6a46e727ae2ae11177611232eaeb9
+    revision: 3fc11c14f29a161054766fabd95f90ab2a9e473a
     version: null
     source:
       Git: https://github.com/pulp-platform/opentitan.git
     dependencies:
     - axi
+    - cluster_interconnect
+    - idma
+    - register_interface
   opentitan_peripherals:
     revision: cd3153de2783abd3d03d0595e6c4b32413c62f14
     version: 0.4.0
@@ -369,7 +382,7 @@ packages:
     - axi
     - common_verification
   pulp_cluster:
-    revision: 3cd3e83fdd7a791e8ae54aef39423004581c8a48
+    revision: 9be39b5b300f48015c931993273f9a288abc1318
     version: null
     source:
       Git: https://github.com/pulp-platform/pulp_cluster.git
@@ -387,6 +400,7 @@ packages:
     - ibex
     - idma
     - mchan
+    - neureka
     - per2axi
     - redmule
     - redundancy_cells
@@ -396,7 +410,7 @@ packages:
     - tech_cells_generic
     - timer_unit
   redmule:
-    revision: 1b30b0b9a31afa702eb2d166d672ceda2f5d463a
+    revision: 68999ccc922b10a5043bb98f67aaf3d8d8d59f3f
     version: null
     source:
       Git: https://github.com/pulp-platform/redmule.git
@@ -528,3 +542,9 @@ packages:
     - axi
     - common_cells
     - register_interface
+  zeroriscy:
+    revision: cc4068a0ccb7691cd062b809c34b2304e7fbfa36
+    version: null
+    source:
+      Git: [email protected]:yvantor/ibex.git
+    dependencies: []

Bender.yml

@@ -13,12 +13,12 @@ package:
 dependencies:
   register_interface: { git: https://github.com/pulp-platform/register_interface.git,   version: 0.4.3                                }
   axi:                { git: https://github.com/pulp-platform/axi.git,                  version: 0.39.1                               }
-  cheshire:           { git: https://github.com/pulp-platform/cheshire.git,             rev: 6d389373df6b54c09888f89411b7e231d2430722 } # branch: astral-new
+  cheshire:           { git: https://github.com/pulp-platform/cheshire.git,             rev: cc1ca617df246f7aae7ef76d5a3277e44b974ed6 } # branch: buildroot-remote
   hyperbus:           { git: https://github.com/pulp-platform/hyperbus.git,             rev: f039e601c8b6590181734e6d26ff8b77aa380412 } # branch: chi/add_fsm_with_Tcsh
   dyn_mem:            { git: https://github.com/pulp-platform/dyn_spm.git,              rev: 480590062742230dc9bd4050358a15b4747bdf34 } # branch: main
   safety_island:      { git: https://github.com/pulp-platform/safety_island.git,        rev: aaef55c798ab53560faaf451a86668fa1e6d0f3b } # branch: carfield
-  pulp_cluster:       { git: https://github.com/pulp-platform/pulp_cluster.git,         rev: 3cd3e83fdd7a791e8ae54aef39423004581c8a48 } # branch: idw-conv
-  opentitan:          { git: https://github.com/pulp-platform/opentitan.git,            rev: 74e7d6ca17e6a46e727ae2ae11177611232eaeb9 } # branch: carfield_soc
+  pulp_cluster:       { git: https://github.com/pulp-platform/pulp_cluster.git,         rev: 9be39b5b300f48015c931993273f9a288abc1318 } # branch: astral
+  opentitan:          { git: https://github.com/pulp-platform/opentitan.git,            rev: 3fc11c14f29a161054766fabd95f90ab2a9e473a } # branch: mc/astral
   mailbox_unit:       { git: https://github.com/pulp-platform/mailbox_unit.git,         version: 1.1.0                                }
   apb:                { git: https://github.com/pulp-platform/apb.git,                  version: 0.2.3                                }
   timer_unit:         { git: https://github.com/pulp-platform/timer_unit.git,           version: 1.0.2                                }
@@ -39,6 +39,11 @@ workspace:
 
 sources:
   # Configurations
+    # "Small" Astral configuration
+  - target: carfield_secure_pulp_periph_can
+    files:
+      - hw/configs/carfield_secure_pulp_periph_can.sv
+
   - target: carfield_l2dual_safe_secure_pulp_spatz_periph_can
     files:
       - hw/configs/carfield_l2dual_safe_secure_pulp_spatz_periph_can.sv
@@ -71,6 +76,10 @@ sources:
     files:
       - hw/configs/carfield_l2dual_safe_pulp_spatz_periph.sv
 
+  - target: carfield_l2dual_secure_pulp_periph_can
+    files:
+      - hw/configs/carfield_l2dual_secure_pulp_periph_can.sv
+
   # Source files grouped in levels. Files in level 0 have no dependencies on files in this
   # package. Files in level 1 only depend on files in level 0, files in level 2 on files in
   # levels 1 and 0, etc. Files within a level are ordered alphabetically.
@@ -102,7 +111,7 @@ sources:
     files:
       - tech/sourcecode/tc_clk.sv
       - tech/sourcecode/tc_sram.sv
-      - target/synth/carfield_synth_wrap.sv
+      - target/synth/src/carfield_synth_wrap.sv
 
   - target: tech_sim
     files:

carfield.mk

@@ -23,6 +23,7 @@ CAR_SW_DIR  := $(CAR_ROOT)/sw
 CAR_TGT_DIR := $(CAR_ROOT)/target/
 CAR_XIL_DIR := $(CAR_TGT_DIR)/xilinx
 CAR_SIM_DIR := $(CAR_TGT_DIR)/sim
+SECD_ROOT ?= $(shell $(BENDER) path opentitan)
 # Questasim
 CAR_VSIM_DIR := $(CAR_TGT_DIR)/sim/vsim
 
@@ -46,7 +47,7 @@ include $(CAR_ROOT)/bender-safed.mk
 ######################
 
 CAR_NONFREE_REMOTE ?= [email protected]:astral/astral-nonfree.git
-CAR_NONFREE_COMMIT ?= 711d0097
+CAR_NONFREE_COMMIT ?= 28fc3580f64f048174cc7dbb618421c254364c74
 
 ## @section Carfield platform nonfree components
 ## Clone the non-free verification IP for Carfield. Some components such as CI scripts and ASIC
@@ -155,17 +156,35 @@ car-checkout: car-checkout-deps
 ############
 # Build SW #
 ############
-include $(CAR_SW_DIR)/sw.mk
+## @section Islands compile exclusion
+ifeq ($(shell echo $(PULPD_PRESENT)), 1)
+PULPD_SW_BUILD := pulpd-sw-build
+PULPD_SW_INIT := pulpd-sw-init
+endif
+
+ifeq ($(shell echo $(SAFED_PRESENT)), 1)
+SAFED_SW_BUILD := safed-sw-build
+SAFED_SW_INIT := safed-sw-init
+endif
+
+ifeq ($(shell echo $(SPATZD_PRESENT)), 1)
+SPATZD_HW_INIT := spatzd-hw-init
+endif
+
+ifeq ($(shell echo $(SECURED_PRESENT)), 1)
+SECD_HW_INIT := secd-hw-init
+endif
 
 ## @section Carfield platform SW build
+include $(CAR_SW_DIR)/sw.mk
 .PHONY: chs-sw-build
 ## Build the host domain (Cheshire) SW libraries and generates an archive (`libcheshire.a`)
 ## available for Carfield as static library at link time.
 chs-sw-build: chs-sw-all
 
 .PHONY: car-sw-build
 ## Builds carfield application SW and specific libraries. It links against `libcheshire.a`.
-car-sw-build: chs-sw-build safed-sw-build pulpd-sw-build car-sw-all
+car-sw-build: chs-sw-build $(SAFED_SW_BUILD) $(PULPD_SW_BUILD) car-sw-all
 
 .PHONY: safed-sw-init pulpd-sw-init
 ## Clone safe domain's SW stack in the dedicated repository.
@@ -213,7 +232,11 @@ pulpd-sw-build: pulpd-sw-init
 ## Initialize Carfield HW. This step takes care of the generation of the missing hardware or the
 ## update of default HW configurations in some of the domains. See the two prerequisite's comment
 ## for more information.
-car-hw-init: spatzd-hw-init chs-hw-init
+car-hw-init: $(SPATZD_HW_INIT) chs-hw-init $(SECD_HW_INIT)
+
+#Build OpenTitan's debug rom with support for coreid != 0x0
+secd-hw-init:
+	$(MAKE) -C $(SECD_ROOT)/hw/vendor/pulp_riscv_dbg/debug_rom clean all FLAGS=-DCARFIELD=1
 
 ## @section Carfield platform PCRs generation
 .PHONY: regenerate_soc_regs
@@ -284,7 +307,7 @@ include $(CAR_SIM_DIR)/sim.mk
 
 .PHONY: car-init-all
 ## Shortcut to initialize carfield with all the targets described above.
-car-init-all: car-checkout car-hw-init car-sim-init safed-sw-init pulpd-sw-init mibench
+car-init-all: car-checkout car-hw-init car-sim-init $(SAFED_SW_INIT) $(PULPD_SW_INIT) mibench
 
 ## Initialize Carfield and build SW
 .PHONY: car-all
@@ -324,7 +347,7 @@ include $(CAR_XIL_DIR)/xilinx.mk
 mibench: $(CAR_SW_DIR)/benchmarks/mibench
 
 $(CAR_SW_DIR)/benchmarks/mibench:
-	git clone git@github.com:alex96295/mibench.git -b carfield $@
+	git clone https://github.com/alex96295/mibench.git -b carfield $@
 
 # Litmus tests
 LITMUS_WORK_DIR  := work-litmus

env/env-iis.sh

@@ -3,6 +3,12 @@
 # SPDX-License-Identifier: SHL-0.51
 #
 
+# Set environment variables to choose of which island we have to compile the sw
+export PULPD_PRESENT=1
+export SAFED_PRESENT=1
+export SECURED_PRESENT=1
+export SPATZD_PRESENT=1
+
 # set up environment variables for rtl simulation
 ROOTD=$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")/.." && pwd)
 export PATH=/usr/pack/riscv-1.0-kgf/riscv64-gcc-11.2.0/bin:$PATH # RV64 GCC toolchain

env/pulpd-env.sh

@@ -5,4 +5,4 @@
 
 # set up environment variables for rtl simulation
 ROOTD=$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")/.." && pwd)
-[[ -d "$ROOTD/pulp_cluster/pulp-runtime" ]] && source "$ROOTD/pulp_cluster/pulp-runtime/configs/carfield-cluster.sh"
+[[ -d "$ROOTD/pulp_cluster/pulp-runtime" ]] && source "$ROOTD/pulp_cluster/pulp-runtime/configs/astral-cluster.sh"