targets: Replace self.add_wb_master with self.bus.add_master.
This commit is contained in:
parent
39a314cdae
commit
4fbf2fc7de
|
@ -91,7 +91,7 @@ class BaseSoC(SoCCore):
|
||||||
axi = self.cpu.add_axi_gp_master(2, 32),
|
axi = self.cpu.add_axi_gp_master(2, 32),
|
||||||
wishbone = wb_lpd,
|
wishbone = wb_lpd,
|
||||||
base_address = self.mem_map['csr'])
|
base_address = self.mem_map['csr'])
|
||||||
self.add_wb_master(wb_lpd)
|
self.bus.add_master(master=wb_lpd)
|
||||||
|
|
||||||
self.bus.add_region("sram", SoCRegion(
|
self.bus.add_region("sram", SoCRegion(
|
||||||
origin = self.cpu.mem_map["sram"],
|
origin = self.cpu.mem_map["sram"],
|
||||||
|
|
|
@ -83,7 +83,7 @@ class BaseSoC(SoCCore):
|
||||||
axi = self.cpu.add_axi_gp_master(),
|
axi = self.cpu.add_axi_gp_master(),
|
||||||
wishbone = wb_gp0,
|
wishbone = wb_gp0,
|
||||||
base_address = self.mem_map['csr'])
|
base_address = self.mem_map['csr'])
|
||||||
self.add_wb_master(wb_gp0)
|
self.bus.add_master(master=wb_gp0)
|
||||||
|
|
||||||
# Leds -------------------------------------------------------------------------------------
|
# Leds -------------------------------------------------------------------------------------
|
||||||
if with_led_chaser:
|
if with_led_chaser:
|
||||||
|
|
|
@ -81,7 +81,7 @@ class BaseSoC(SoCCore):
|
||||||
axi = self.cpu.add_axi_gp_master(),
|
axi = self.cpu.add_axi_gp_master(),
|
||||||
wishbone = wb_gp0,
|
wishbone = wb_gp0,
|
||||||
base_address = 0x43c00000)
|
base_address = 0x43c00000)
|
||||||
self.add_wb_master(wb_gp0)
|
self.bus.add_master(master=wb_gp0)
|
||||||
|
|
||||||
# Video ------------------------------------------------------------------------------------
|
# Video ------------------------------------------------------------------------------------
|
||||||
if with_video_terminal:
|
if with_video_terminal:
|
||||||
|
|
|
@ -75,7 +75,7 @@ class BaseSoC(SoCCore):
|
||||||
axi = self.cpu.add_axi_gp_master(),
|
axi = self.cpu.add_axi_gp_master(),
|
||||||
wishbone = wb_gp0,
|
wishbone = wb_gp0,
|
||||||
base_address = self.mem_map["csr"])
|
base_address = self.mem_map["csr"])
|
||||||
self.add_wb_master(wb_gp0)
|
self.bus.add_master(master=wb_gp0)
|
||||||
|
|
||||||
self.bus.add_region("sram", SoCRegion(
|
self.bus.add_region("sram", SoCRegion(
|
||||||
origin=self.cpu.mem_map["sram"],
|
origin=self.cpu.mem_map["sram"],
|
||||||
|
|
|
@ -93,7 +93,7 @@ class BaseSoC(SoCCore):
|
||||||
axi = self.cpu.add_axi_gp_master(),
|
axi = self.cpu.add_axi_gp_master(),
|
||||||
wishbone = wb_gp0,
|
wishbone = wb_gp0,
|
||||||
base_address = self.mem_map['csr'])
|
base_address = self.mem_map['csr'])
|
||||||
self.add_wb_master(wb_gp0)
|
self.bus.add_master(master=wb_gp0)
|
||||||
|
|
||||||
# Leds -------------------------------------------------------------------------------------
|
# Leds -------------------------------------------------------------------------------------
|
||||||
if with_led_chaser:
|
if with_led_chaser:
|
||||||
|
|
|
@ -73,7 +73,7 @@ class BaseSoC(SoCCore):
|
||||||
axi = self.cpu.add_axi_gp_master(),
|
axi = self.cpu.add_axi_gp_master(),
|
||||||
wishbone = wb_gp0,
|
wishbone = wb_gp0,
|
||||||
base_address = 0x43c00000)
|
base_address = 0x43c00000)
|
||||||
self.add_wb_master(wb_gp0)
|
self.bus.add_master(master=wb_gp0)
|
||||||
|
|
||||||
# Leds -------------------------------------------------------------------------------------
|
# Leds -------------------------------------------------------------------------------------
|
||||||
if with_led_chaser:
|
if with_led_chaser:
|
||||||
|
|
|
@ -129,7 +129,7 @@ class BaseSoC(SoCCore):
|
||||||
|
|
||||||
# Etherbone
|
# Etherbone
|
||||||
self.submodules.etherbone = LiteEthEtherbone(self.udp, 1234, mode="master")
|
self.submodules.etherbone = LiteEthEtherbone(self.udp, 1234, mode="master")
|
||||||
self.add_wb_master(self.etherbone.wishbone.bus)
|
self.bus.add_master(master=self.etherbone.wishbone.bus)
|
||||||
|
|
||||||
# Timing constraints
|
# Timing constraints
|
||||||
eth_rx_clk = self.ethphy.crg.cd_eth_rx.clk
|
eth_rx_clk = self.ethphy.crg.cd_eth_rx.clk
|
||||||
|
|
|
@ -105,7 +105,7 @@ class BaseSoC(SoCCore):
|
||||||
# Wishbone bridge
|
# Wishbone bridge
|
||||||
self.submodules.pcie_bridge = LitePCIeWishboneBridge(self.pcie_endpoint,
|
self.submodules.pcie_bridge = LitePCIeWishboneBridge(self.pcie_endpoint,
|
||||||
base_address = self.mem_map["csr"])
|
base_address = self.mem_map["csr"])
|
||||||
self.add_wb_master(self.pcie_bridge.wishbone)
|
self.bus.add_master(master=self.pcie_bridge.wishbone)
|
||||||
|
|
||||||
# DMA0
|
# DMA0
|
||||||
self.submodules.pcie_dma0 = LitePCIeDMA(self.pcie_phy, self.pcie_endpoint,
|
self.submodules.pcie_dma0 = LitePCIeDMA(self.pcie_phy, self.pcie_endpoint,
|
||||||
|
|
|
@ -132,7 +132,7 @@ class BaseSoC(SoCCore):
|
||||||
axi = self.cpu.add_axi_gp_master(),
|
axi = self.cpu.add_axi_gp_master(),
|
||||||
wishbone = wb_gp0,
|
wishbone = wb_gp0,
|
||||||
base_address = self.mem_map["csr"])
|
base_address = self.mem_map["csr"])
|
||||||
self.add_wb_master(wb_gp0)
|
self.bus.add_master(master=wb_gp0)
|
||||||
self.bus.add_region("sram", SoCRegion(
|
self.bus.add_region("sram", SoCRegion(
|
||||||
origin=self.cpu.mem_map["sram"],
|
origin=self.cpu.mem_map["sram"],
|
||||||
size=2 * 1024 * 1024 * 1024) # DDR
|
size=2 * 1024 * 1024 * 1024) # DDR
|
||||||
|
|
|
@ -112,7 +112,7 @@ class BaseSoC(SoCCore):
|
||||||
axi = self.cpu.add_axi_gp_master(),
|
axi = self.cpu.add_axi_gp_master(),
|
||||||
wishbone = wb_gp0,
|
wishbone = wb_gp0,
|
||||||
base_address = self.mem_map["csr"])
|
base_address = self.mem_map["csr"])
|
||||||
self.add_wb_master(wb_gp0)
|
self.bus.add_master(master=wb_gp0)
|
||||||
self.bus.add_region("sram", SoCRegion(
|
self.bus.add_region("sram", SoCRegion(
|
||||||
origin = self.cpu.mem_map["sram"],
|
origin = self.cpu.mem_map["sram"],
|
||||||
size = 2 * 1024 * 1024 * 1024) # DDR
|
size = 2 * 1024 * 1024 * 1024) # DDR
|
||||||
|
|
|
@ -67,7 +67,7 @@ class BaseSoC(SoCCore):
|
||||||
axi = self.cpu.add_axi_gp_master(),
|
axi = self.cpu.add_axi_gp_master(),
|
||||||
wishbone = wb_gp0,
|
wishbone = wb_gp0,
|
||||||
base_address = 0x43c00000)
|
base_address = 0x43c00000)
|
||||||
self.add_wb_master(wb_gp0)
|
self.bus.add_master(master=wb_gp0)
|
||||||
|
|
||||||
# Leds -------------------------------------------------------------------------------------
|
# Leds -------------------------------------------------------------------------------------
|
||||||
if with_led_chaser:
|
if with_led_chaser:
|
||||||
|
|
Loading…
Reference in New Issue