Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Rocketchip to June 2020 #208

Merged
merged 1 commit into from
Jun 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rocket/src/main/scala/amba/apb/Node.scala
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ case class BundleBridgeToAPBNode(masterParams: APBMasterPortParameters)(implicit
dFn = { mp =>
masterParams
},
uFn = { slaveParams => BundleBridgeNull() }
uFn = { slaveParams => BundleBridgeParams(None) }
)

object BundleBridgeToAPBNode {
Expand Down
2 changes: 1 addition & 1 deletion rocket/src/main/scala/amba/axi4/Node.scala
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ case class BundleBridgeToAXI4Node(masterParams: AXI4MasterPortParameters)(implic
dFn = { mp =>
masterParams
},
uFn = { slaveParams => BundleBridgeNull() }
uFn = { slaveParams => BundleBridgeParams(None) }
)

object BundleBridgeToAXI4Node {
Expand Down
2 changes: 1 addition & 1 deletion rocket/src/main/scala/amba/axi4stream/Nodes.scala
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ extends MixedAdapterNode(AXI4StreamBundleBridgeImp, AXI4StreamImp)(
dFn = { mp =>
masterParams
},
uFn = { slaveParams => BundleBridgeNull() }// BundleBridgeParams(() => AXI4StreamBundle(AXI4StreamBundleParameters.joinEdge(masterParams, slaveParams)))}
uFn = { slaveParams => BundleBridgeParams(None) }// BundleBridgeParams(() => AXI4StreamBundle(AXI4StreamBundleParameters.joinEdge(masterParams, slaveParams)))}
)

object BundleBridgeToAXI4StreamNode {
Expand Down
2 changes: 1 addition & 1 deletion rocket/src/main/scala/interrupts/Nodes.scala
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ object IntToBundleBridge {
case class BundleBridgeToIntNode(sourceParams: IntSourcePortParameters)
(implicit valName: ValName) extends MixedAdapterNode(IntBundleBridgeImp, IntImp)(
dFn = {sinkParams => sourceParams},
uFn = { slaveParams => BundleBridgeNull() }
uFn = { slaveParams => BundleBridgeParams(None) }
)

class BundleBridgeToInt(sourceParams: IntSourcePortParameters)(implicit p: Parameters)
Expand Down
2 changes: 1 addition & 1 deletion rocket/src/main/scala/tl/Node.scala
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ case class BundleBridgeToTLNode(clientParams: TLClientPortParameters)(implicit v
dFn = { mp =>
clientParams
},
uFn = { slaveParams => BundleBridgeNull() }
uFn = { slaveParams => BundleBridgeParams(None) }
)

object BundleBridgeToTLNode {
Expand Down