Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Sign in
P
Platform-independent core collection
  • Project
    • Project
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 10
    • Issues 10
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 4
    • Merge Requests 4
  • Wiki
    • Wiki
  • image/svg+xml
    Discourse
    • Discourse
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • Projects
  • Platform-independent core collection
  • Merge Requests
  • !20

Closed
Opened Oct 09, 2022 by Peter Jansweijer@peterj
  • Report abuse
Report abuse

Wb axi4lite bridge fix

b) SPEC7 uses general-cores "xwb_axi4lite_bridge" which had a small bug that was repaired by Pascal (general-cores.git; wb_axi4lite_bridge_fix; SHA-1: c5599a5a)

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b wb_axi4lite_bridge_fix origin/wb_axi4lite_bridge_fix

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff wb_axi4lite_bridge_fix

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 1
  • Commits 17
  • Changes 21
Tristan Gingold
Assignee
Tristan Gingold @tgingold
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: project/general-cores!20