Skip to content

Merge x2s Dev Branches

Created by: silabs-robin

This PR merges the cv32e40x/dev branch into cv32e40s/dev. (No manual copying between the two directories.)

Test status:

  • 40s ci_check - Passes 100%
  • Formal - Still runnable
  • 40x ci_check - Passes (except 2 known pmp-related failures) (when cloning in my x merge branch)

Conflicts resolved manually:

  • mk/uvmt/vsim.mk
    • Taken from X
  • lib/uvm_agents/uvma_rvvi_ovpsim/uvma_rvvi_ovpsim_agent.sv
    • Conflict was about code alignment; chose the aligned one
  • cv32e40s/tests/cfg/clic_default.yaml
    • Taken from S
  • cv32e40s/env/uvme/uvma_cv32e40s_core_cntrl_agent.sv
    • Taken from S

Merge request reports

Loading