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
Please register or sign in to comment