Skip to content

Sxmerge 2023 05 19

Created by: silabs-robin

This PR does a merge from core-v-verif:cv32e40s/dev to cv32e40x-dv:master.

Test status:

  • ci_check - Passes (except for known pmp-related fails in "clic" and "debug_test2).
  • Formal - Works.

FYI, the full "path" of the merge is:

  1. openhwgroup:core-v-verif:cv32e40s/dev (starting with the 40s dev branch in current development)
  2. (local) cv32e40sdev_subtree (using "git subtree")
  3. silabs-robin:core-v-verif:cv32e40sdev_subtree_xmove ("git mv" all the s files to x equivalents)
  4. silabs-robin:core-v-verif:cv32e40sdev_subtree_xmove_xsubstitute (substituting all 40s content to 40x)
  5. silabs-robin:cv32e40x-dv:sxmerge_2023_05_19 (merge into a branch off of MikeOpenHWGroup:cv32e40x-dv:master)
  6. MikeOpenHWGroup:cv32e40x-dv:master (this PR, merging in the updates)

Note: 1 and 2 could in the future just be openhwgroup:cv32e40s-dv:master.

Note: 3, 4, and 5 could be done as one step, I just like to have control over each detail.

Note: With the two notes above in mind, the process is much simpler than it looks.

Merge request reports

Loading