Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cl/eth astral #8

Closed
wants to merge 4 commits into from
Closed

Cl/eth astral #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ed5963
ethernet integration
chaoqun-liang Apr 10, 2024
ff9b16b
ethernet integration
chaoqun-liang Apr 17, 2024
07550ed
ethernet
chaoqun-liang Apr 17, 2024
049b6aa
ethernet in cheshire
chaoqun-liang Apr 26, 2024
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
2 changes: 1 addition & 1 deletion Bender.local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ overrides:
hci: { git: "https://github.com/pulp-platform/hci.git" , rev: v1.1 }
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 }
idma: { git: "https://github.com/pulp-platform/idma.git" , version: 0.6.0 }
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
Expand Down
42 changes: 34 additions & 8 deletions Bender.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,13 @@ packages:
Git: https://github.com/pulp-platform/axi_slice.git
dependencies:
- common_cells
axi_stream:
revision: 54891ff40455ca94a37641b9da4604647878cc07
version: 0.1.1
source:
Git: [email protected]:pulp-platform/axi_stream.git
dependencies:
- common_cells
axi_vga:
revision: 3718b9930f94a9eaad8ee50b4bccc71df0403084
version: 0.1.3
Expand All @@ -106,7 +113,7 @@ packages:
Git: https://github.com/AlSaqr-platform/can_bus.git
dependencies: []
cheshire:
revision: 6d389373df6b54c09888f89411b7e231d2430722
revision: f0c18fcf46473cb611642a3ed6334ca6d84b421e
version: null
source:
Git: https://github.com/pulp-platform/cheshire.git
Expand All @@ -122,6 +129,7 @@ packages:
- common_cells
- common_verification
- cva6
- ethernet
- idma
- irq_router
- opentitan_peripherals
Expand Down Expand Up @@ -162,8 +170,8 @@ packages:
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:
Expand Down Expand Up @@ -208,6 +216,18 @@ packages:
- redundancy_cells
- register_interface
- tech_cells_generic
ethernet:
revision: ca7feb6e5722aaec7bdb6d71d4cfddfe58f18afd
version: null
source:
Git: https://github.com/pulp-platform/pulp-ethernet.git
dependencies:
- axi
- axi_stream
- common_cells
- common_verification
- idma
- register_interface
event_unit_flex:
revision: 28e0499374117c7b0ef4c6ad81b60d7526af886f
version: null
Expand Down Expand Up @@ -259,8 +279,8 @@ packages:
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:
Expand Down Expand Up @@ -289,14 +309,16 @@ packages:
Git: https://github.com/pulp-platform/icache-intc.git
dependencies: []
idma:
revision: ca1b28816a3706be0bf9ce01378246d5346384f0
version: 0.5.1
revision: d6245c8bf8faa7a4d44325d6584387170413d53d
version: 0.6.0
source:
Git: https://github.com/pulp-platform/idma.git
dependencies:
- axi
- axi_stream
- common_cells
- common_verification
- obi
- register_interface
irq_router:
revision: d1d31350b24f3965b3a51e1bc96c71eb34e94db3
Expand Down Expand Up @@ -364,13 +386,17 @@ packages:
dependencies:
- axi_slice
pulp-ethernet:
revision: bdc8031ab270a49da28df269266ce9ab9a133636
revision: ca7feb6e5722aaec7bdb6d71d4cfddfe58f18afd
version: null
source:
Git: https://github.com/pulp-platform/pulp-ethernet.git
dependencies:
- axi
- axi_stream
- common_cells
- common_verification
- idma
- register_interface
pulp_cluster:
revision: 3cd3e83fdd7a791e8ae54aef39423004581c8a48
version: null
Expand Down
6 changes: 3 additions & 3 deletions Bender.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ 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: f0c18fcf46473cb611642a3ed6334ca6d84b421e } # branch: cl/eth-astral
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
Expand All @@ -26,7 +26,7 @@ dependencies:
can_bus: { git: https://github.com/AlSaqr-platform/can_bus.git, rev: 0ec0bf8b7dab6d5e4b3f7ec58338a8efee066379 } # branch: pulp
spatz: { git: https://github.com/pulp-platform/spatz.git, rev: 98de97f24fe42675c9b4a8cc08354a03af57400a } # branch: yt/astral
common_cells: { git: https://github.com/pulp-platform/common_cells.git, version: 1.31.1 }
pulp-ethernet: { git: https://github.com/pulp-platform/pulp-ethernet.git, rev: bdc8031ab270a49da28df269266ce9ab9a133636 } # branch: carfield
pulp-ethernet: { git: https://github.com/pulp-platform/pulp-ethernet.git, rev: ca7feb6e5722aaec7bdb6d71d4cfddfe58f18afd } # branch: cl/eth_idma
riscv-dbg: { git: https://github.com/pulp-platform/riscv-dbg.git, version: =0.8.0 }

workspace:
Expand Down Expand Up @@ -75,7 +75,7 @@ sources:
# 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.
# Level 0
- hw/carfield_pkg.sv
- hw/carfield_pkg.sv
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trailing spaces.

- hw/regs/carfield_reg_pkg.sv
- hw/regs/carfield_reg_top.sv
# Level 1
Expand Down
3 changes: 2 additions & 1 deletion bender-common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ common_targs += -t integer_cluster
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 rtl
common_targs += -t snitch_cluster
# Carfield config target.
common_targs += -t $(CARFIELD_CONFIG)

Expand Down
6 changes: 3 additions & 3 deletions carfield.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ 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 pulpd-sw-build car-sw-all #safed-sw-build
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why commenting out the safed-sw-build?


.PHONY: safed-sw-init pulpd-sw-init
## Clone safe domain's SW stack in the dedicated repository.
Expand Down Expand Up @@ -214,7 +214,7 @@ 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 secd-hw-init
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why removing the secd-hw-init?

car-hw-init: spatzd-hw-init chs-hw-init

#Build OpenTitan's debug rom with support for coreid != 0x0
secd-hw-init:
Expand Down Expand Up @@ -289,7 +289,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 pulpd-sw-init mibench #safed-sw-init
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why commenting out the safed-sw-init?


## Initialize Carfield and build SW
.PHONY: car-all
Expand Down
Loading
Loading