X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmain%2Fscala%2Fip%2Fxilinx%2Fvc707axi_to_pcie_x1%2Fvc707axi_to_pcie_x1.scala;h=7e732f8160e5dfa6823f71cd4442756ad1240792;hb=d973c659eb239d8bb1447ffe9a73df20cdd7bf04;hp=ac9745f46672dc61b9a970021fa7ab4e6d77b8bc;hpb=0ca609d324424dc2488e51273ec89c5714d3c95e;p=sifive-blocks.git diff --git a/src/main/scala/ip/xilinx/vc707axi_to_pcie_x1/vc707axi_to_pcie_x1.scala b/src/main/scala/ip/xilinx/vc707axi_to_pcie_x1/vc707axi_to_pcie_x1.scala index ac9745f..7e732f8 100644 --- a/src/main/scala/ip/xilinx/vc707axi_to_pcie_x1/vc707axi_to_pcie_x1.scala +++ b/src/main/scala/ip/xilinx/vc707axi_to_pcie_x1/vc707axi_to_pcie_x1.scala @@ -2,11 +2,10 @@ package sifive.blocks.ip.xilinx.vc707axi_to_pcie_x1 import Chisel._ -import config._ -import diplomacy._ -import uncore.axi4._ -import uncore.tilelink2.{IntSourceNode, IntSourcePortSimple} -import junctions._ +import freechips.rocketchip.config._ +import freechips.rocketchip.diplomacy._ +import freechips.rocketchip.amba.axi4._ +import freechips.rocketchip.tilelink.{IntSourceNode, IntSourcePortSimple} // IP VLNV: xilinx.com:customize_ip:vc707pcietoaxi:1.0 // Black Box @@ -181,8 +180,8 @@ class VC707AXIToPCIeX1(implicit p:Parameters) extends LazyModule "device_type" -> Seq(ResourceString("pci")), "interrupt-map-mask" -> Seq(0, 0, 0, 7).flatMap(ofInt), "interrupt-map" -> Seq(1, 2, 3, 4).flatMap(ofMap), - "ranges" -> resources("ranges").map { case Binding(_, ResourceAddress(address, _, _, _, _)) => - ResourceMapping(address, BigInt(0x02000000) << 64) }, + "ranges" -> resources("ranges").map { case Binding(_, ResourceAddress(address, perms)) => + ResourceMapping(address, BigInt(0x02000000) << 64, perms) }, "interrupt-controller" -> Seq(ResourceMap(labels = Seq(intc), value = Map( "interrupt-controller" -> Nil, "#address-cells" -> ofInt(0), @@ -203,7 +202,7 @@ class VC707AXIToPCIeX1(implicit p:Parameters) extends LazyModule val control = AXI4SlaveNode(Seq(AXI4SlavePortParameters( slaves = Seq(AXI4SlaveParameters( address = List(AddressSet(0x50000000L, 0x03ffffffL)), - resources = device.reg, + resources = device.reg("control"), supportsWrite = TransferSizes(1, 4), supportsRead = TransferSizes(1, 4), interleavedId = Some(0))), // AXI4-Lite never interleaves responses