Commit 35a1ded6 authored by Jim Lawson's avatar Jim Lawson
Browse files

Merge branch 'master' into 1.3.x

# Conflicts:
#	build.sbt
#	chisel3
#	firrtl
#	src/main/scala/rocket/Frontend.scala
#	src/main/scala/rocket/RocketCore.scala
#	src/main/scala/subsystem/BaseSubsystem.scala
#	src/main/scala/tile/CustomCSRs.scala
#	src/main/scala/tilelink/BusWrapper.scala
#	wit-manifest.json
parents 3844e033 21f9bf6f
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment