Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Bender.local
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ 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 }
register_interface: { git: "https://github.com/pulp-platform/register_interface.git" , version: 0.4.1 }
redundancy_cells: { git: "https://github.com/pulp-platform/redundancy_cells.git" , rev: "5616a36f5e51d6f07f1c8bca15194077657e197d" } # branch: yt/rapidrecovery
redundancy_cells: { git: "https://github.com/pulp-platform/redundancy_cells.git" , rev: astral-v0 }
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: a971e364bf8090cf77fafad995b480c1ac7ea4e0 }
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
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 }
serial_link: { git: "https://github.com/pulp-platform/serial_link.git" , rev: 4024f01b1d67cdf1cf9486467d0f2e2f407aa372 }
neureka: { git: "https://github.com/pulp-platform/neureka.git" , rev: f6b9a014c7ff4c536865c8ad376b383d4026f286 }
softex: { git: "https://github.com/belanoa/softex.git" , rev: a93ddff106ca3596660584ce6c7f77fb2a8475e3 }
119 changes: 73 additions & 46 deletions Bender.lock
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ packages:
- common_verification
- tech_cells_generic
axi2mem:
revision: 6973e0434d26ba578cdb4aa69c26c1facd1a3f15
version: null
revision: be0c696709acaee579787ba2432d26ad27640594
version: 1.0.2
source:
Git: https://github.com/pulp-platform/axi2mem.git
dependencies:
- axi_slice
- common_cells
axi2per:
revision: a99ef2fac9f3b087671109a27c766f25e8e0f115
version: 1.0.1
revision: e8ca052a745e184ca960933b2fe416b725e9ca81
version: 1.0.2
source:
Git: https://github.com/pulp-platform/axi2per.git
dependencies:
Expand All @@ -58,14 +58,6 @@ packages:
- common_verification
- register_interface
- tech_cells_generic
axi_node:
revision: e2d038004c5b8cec9dd3bb9d23ad0bee72f9d908
version: 1.1.4
source:
Git: git@github.com:pulp-platform/axi_node.git
dependencies:
- axi
- common_cells
axi_obi:
revision: null
version: null
Expand Down Expand Up @@ -101,8 +93,8 @@ packages:
dependencies:
- common_cells
axi_vga:
revision: 07be187d1e954d8090031b32d236ad76dc62ce45
version: 0.1.1
revision: 4d3e70d4f47bb74edc1ab68d99ffc02382e0fb9e
version: 0.1.4
source:
Git: https://github.com/pulp-platform/axi_vga.git
dependencies:
Expand Down Expand Up @@ -167,15 +159,15 @@ packages:
- scm
- tech_cells_generic
cluster_interconnect:
revision: 89e1019d64a86425211be6200770576cbdf3e8b3
version: null
revision: 2967d8d17be0a6139229ca8d3d4956e182aec3de
version: 1.3.0
source:
Git: https://github.com/pulp-platform/cluster_interconnect.git
dependencies:
- common_cells
cluster_peripherals:
revision: c015839816938a790c8da5fd5829cfc536f1ca9c
version: null
revision: e464eb9ddcc39e5a50009819601c4f213b1d4ba3
version: 2.2.0
source:
Git: https://github.com/pulp-platform/cluster_peripherals.git
dependencies:
Expand All @@ -189,8 +181,8 @@ packages:
- common_verification
- tech_cells_generic
common_verification:
revision: 9c07fa860593b2caabd9b5681740c25fac04b878
version: 0.2.3
revision: fb1885f48ea46164a10568aeff51884389f67ae3
version: 0.2.5
source:
Git: https://github.com/pulp-platform/common_verification.git
dependencies: []
Expand Down Expand Up @@ -233,6 +225,14 @@ packages:
Git: https://github.com/pulp-platform/event_unit_flex.git
dependencies:
- common_cells
flex-v:
revision: e9355c2f6ec4c105abdff39489e5d1be93bc4374
version: null
source:
Git: https://github.com/pulp-platform/flex-v.git
dependencies:
- fpnew
- tech_cells_generic
fpnew:
revision: a8e0cba6dd50f357ece73c2c955d96efc3c6c315
version: null
Expand All @@ -249,36 +249,39 @@ packages:
dependencies:
- common_cells
hci:
revision: b2e6f391aa6c10c03f45b693d80a0aaddecf169b
revision: aed9005c761827c6cbff2ea9a15f9cc37acd1169
version: null
source:
Git: https://github.com/pulp-platform/hci.git
dependencies:
- cluster_interconnect
- common_cells
- hwpe-stream
- l2_tcdm_hybrid_interco
- redundancy_cells
- register_interface
hier-icache:
revision: a971e364bf8090cf77fafad995b480c1ac7ea4e0
version: null
revision: 7243834d2407ca23cff583d57641c84b982bd9bc
version: 1.3.0
source:
Git: https://github.com/pulp-platform/hier-icache.git
dependencies:
- axi_node
- axi
- axi_slice
- common_cells
- icache-intc
- 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: ddc154424187dff42a8fcec946c768ceb13f13de
version: 1.6.4
revision: 3bc9694705b72a5b9bddc7fcde5091b9e45ba0c8
version: null
source:
Git: https://github.com/pulp-platform/hwpe-stream.git
dependencies:
Expand All @@ -304,7 +307,7 @@ packages:
revision: 663c3b6d3c2bf63ff25cda46f33c799c647b3985
version: 1.0.1
source:
Git: git@github.com:pulp-platform/icache-intc.git
Git: https://github.com/pulp-platform/icache-intc.git
dependencies: []
idma:
revision: ca1b28816a3706be0bf9ce01378246d5346384f0
Expand Down Expand Up @@ -341,12 +344,23 @@ packages:
- common_cells
- register_interface
mchan:
revision: 7f064f205a3e0203e959b14773c4afecf56681ab
version: null
revision: 3f2ae92f78e2ddbd0e079cbb4f81fcc248171c12
version: 1.2.4
source:
Git: https://github.com/pulp-platform/mchan.git
dependencies:
- common_cells
neureka:
revision: f6b9a014c7ff4c536865c8ad376b383d4026f286
version: null
source:
Git: https://github.com/pulp-platform/neureka.git
dependencies:
- hci
- hwpe-ctrl
- hwpe-stream
- register_interface
- zeroriscy
obi:
revision: 0155fc34e900c7c884e081c0a1114a247937ff69
version: 0.1.7
Expand Down Expand Up @@ -380,8 +394,8 @@ packages:
- register_interface
- tech_cells_generic
per2axi:
revision: 892fcad60b6374fe558cbde76f4a529d473ba5ca
version: 1.0.4
revision: 18cf4f2ad51b73de0448843ce0def54ab5fb274b
version: 1.0.5
source:
Git: https://github.com/pulp-platform/per2axi.git
dependencies:
Expand All @@ -395,35 +409,37 @@ packages:
- axi
- common_verification
pulp_cluster:
revision: 135d0883d82d58ac803725ef69b027c666df7115
version: null
revision: 579905eacb7c4b94be91a4e0cb76697acb62b1c3
version: 3.0.3
source:
Git: https://github.com/pulp-platform/pulp_cluster.git
dependencies:
- axi
- axi2mem
- axi2per
- axi_slice
- cluster_icache
- cluster_interconnect
- cluster_peripherals
- common_cells
- cv32e40p
- event_unit_flex
- flex-v
- hci
- hier-icache
- ibex
- idma
- mchan
- neureka
- per2axi
- redmule
- redundancy_cells
- register_interface
- riscv
- scm
- softex
- tech_cells_generic
- timer_unit
redmule:
revision: 0fe14edd77e9a35d3d220bd78bd6b41a0e5935ea
revision: 9223ccc932e21d0667e9c2d30831db41eec9299e
version: null
source:
Git: https://github.com/pulp-platform/redmule.git
Expand All @@ -434,9 +450,10 @@ packages:
- hci
- hwpe-ctrl
- hwpe-stream
- register_interface
- tech_cells_generic
redundancy_cells:
revision: 5616a36f5e51d6f07f1c8bca15194077657e197d
revision: 9e31f7c6c24877eaf58279903e7a162b16c9a721
version: null
source:
Git: https://github.com/pulp-platform/redundancy_cells.git
Expand All @@ -455,14 +472,6 @@ packages:
- axi
- common_cells
- common_verification
riscv:
revision: a1dcae35edae6092ddbf92c424690cb903b678d5
version: null
source:
Git: git@github.com:AlSaqr-platform/riscv_nn.git
dependencies:
- fpnew
- tech_cells_generic
riscv-dbg:
revision: 138d74bcaa90c70180c12215db3776813d2a95f2
version: 0.8.0
Expand Down Expand Up @@ -508,6 +517,18 @@ packages:
- axi
- common_cells
- register_interface
softex:
revision: a93ddff106ca3596660584ce6c7f77fb2a8475e3
version: null
source:
Git: https://github.com/belanoa/softex.git
dependencies:
- common_cells
- fpnew
- hci
- hwpe-ctrl
- hwpe-stream
- ibex
spatz:
revision: b8fea8f2386f837a0854ad4e84f25b70a3a430e0
version: null
Expand Down Expand Up @@ -556,3 +577,9 @@ packages:
- axi
- common_cells
- register_interface
zeroriscy:
revision: cc4068a0ccb7691cd062b809c34b2304e7fbfa36
version: null
source:
Git: https://github.com/yvantor/ibex.git
dependencies: []
2 changes: 1 addition & 1 deletion Bender.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
hyperbus: { git: https://github.com/pulp-platform/hyperbus.git, version: 0.0.9 }
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: 135d0883d82d58ac803725ef69b027c666df7115 } # branch: yt/rapidrecovery
pulp_cluster: { git: https://github.com/pulp-platform/pulp_cluster.git, version: 3.0.3 }
opentitan: { git: https://github.com/pulp-platform/opentitan.git, rev: 48595339c9bea8eddf7cc799bb74e6af5ec5d846 } # branch: carfield-soc
mailbox_unit: { git: git@github.com:pulp-platform/mailbox_unit.git, version: 1.1.0 }
apb: { git: https://github.com/pulp-platform/apb.git, version: 0.2.3 }
Expand Down
1 change: 1 addition & 0 deletions bender-common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ common_targs += -t cv32e40p_use_ff_regfile
common_targs += -t scm_use_fpga_scm
common_targs += -t cv64a6_imafdcsclic_sv39
common_targs += -t rtl
common_targs += -t deprecated
# Carfield config target.
common_targs += -t $(CARFIELD_CONFIG)

Expand Down
10 changes: 3 additions & 7 deletions carfield.mk
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ include $(CAR_ROOT)/bender-safed.mk
######################

CAR_NONFREE_REMOTE ?= git@iis-git.ee.ethz.ch:carfield/carfield-nonfree.git
CAR_NONFREE_COMMIT ?= f21a428
CAR_NONFREE_COMMIT ?= e7cfa03

## @section Carfield platform nonfree components
## Clone the non-free verification IP for Carfield. Some components such as CI scripts and ASIC
Expand Down Expand Up @@ -191,12 +191,8 @@ $(SAFED_SW_DIR)/pulp-freertos: $(SAFED_ROOT)
$(MAKE) -C $(SAFED_ROOT) pulp-freertos BENDER="$(BENDER)"

## Clone integer PMCA domain's SW stack in the dedicated repository.
pulpd-sw-init: $(PULPD_ROOT) $(PULPD_ROOT)/pulp-runtime $(PULPD_ROOT)/regression-tests

$(PULPD_ROOT)/pulp-runtime: $(PULPD_ROOT)
$(MAKE) -C $(PULPD_ROOT) pulp-runtime
$(PULPD_ROOT)/regression-tests: $(PULPD_ROOT)
$(MAKE) -C $(PULPD_ROOT) regression-tests
pulpd-sw-init:
$(MAKE) -C $(PULPD_ROOT) sw-init

## Build safe domain SW
.PHONY: safed-sw-build
Expand Down
Loading