mirror of
https://github.com/saymrwulf/litex-boards.git
synced 2026-11-17 08:54:59 +00:00
targets/alinx_axu2cga,xilinx_zcu216,xilinx_kv260: remove csr definition and GP0 connection to the SoC: now handled by znqmp core CPU
This commit is contained in:
parent
07881259a5
commit
efd6c8b0aa
3 changed files with 0 additions and 29 deletions
|
|
@ -77,23 +77,12 @@ class BaseSoC(SoCCore):
|
||||||
if kwargs.get("cpu_type", None) == "zynqmp":
|
if kwargs.get("cpu_type", None) == "zynqmp":
|
||||||
kwargs["integrated_sram_size"] = 0
|
kwargs["integrated_sram_size"] = 0
|
||||||
kwargs["with_uart"] = False
|
kwargs["with_uart"] = False
|
||||||
self.mem_map = {
|
|
||||||
"csr": 0x8000_0000, # Zynq GP0 default
|
|
||||||
}
|
|
||||||
SoCCore.__init__(self, platform, sys_clk_freq, ident="LiteX SoC on Alinx AXU2CGA", **kwargs)
|
SoCCore.__init__(self, platform, sys_clk_freq, ident="LiteX SoC on Alinx AXU2CGA", **kwargs)
|
||||||
|
|
||||||
# ZynqMP Integration ---------------------------------------------------------------------
|
# ZynqMP Integration ---------------------------------------------------------------------
|
||||||
if kwargs.get("cpu_type", None) == "zynqmp":
|
if kwargs.get("cpu_type", None) == "zynqmp":
|
||||||
self.cpu.config.update(platform.psu_config)
|
self.cpu.config.update(platform.psu_config)
|
||||||
|
|
||||||
# Connect AXI HPM0 LPD to the SoC
|
|
||||||
wb_lpd = wishbone.Interface()
|
|
||||||
self.submodules += axi.AXI2Wishbone(
|
|
||||||
axi = self.cpu.add_axi_gp_master(2, 32),
|
|
||||||
wishbone = wb_lpd,
|
|
||||||
base_address = self.mem_map["csr"])
|
|
||||||
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"],
|
||||||
size = 1 * 1024 * 1024 * 1024) # DDR
|
size = 1 * 1024 * 1024 * 1024) # DDR
|
||||||
|
|
|
||||||
|
|
@ -56,8 +56,6 @@ class _CRG(LiteXModule):
|
||||||
# BaseSoC ------------------------------------------------------------------------------------------
|
# BaseSoC ------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
class BaseSoC(SoCCore):
|
class BaseSoC(SoCCore):
|
||||||
mem_map = {"csr": 0xA000_0000} # default GP0 address on ZynqMP
|
|
||||||
|
|
||||||
def __init__(self, sys_clk_freq=100e6, **kwargs):
|
def __init__(self, sys_clk_freq=100e6, **kwargs):
|
||||||
platform = xilinx_kv260.Platform()
|
platform = xilinx_kv260.Platform()
|
||||||
|
|
||||||
|
|
@ -127,13 +125,6 @@ class BaseSoC(SoCCore):
|
||||||
'PSU__UART1__PERIPHERAL__IO' : 'MIO 36 .. 37',
|
'PSU__UART1__PERIPHERAL__IO' : 'MIO 36 .. 37',
|
||||||
})
|
})
|
||||||
|
|
||||||
# Connect Zynq AXI master to the SoC
|
|
||||||
wb_gp0 = wishbone.Interface()
|
|
||||||
self.submodules += axi.AXI2Wishbone(
|
|
||||||
axi = self.cpu.add_axi_gp_master(),
|
|
||||||
wishbone = wb_gp0,
|
|
||||||
base_address = self.mem_map["csr"])
|
|
||||||
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
|
||||||
|
|
|
||||||
|
|
@ -46,8 +46,6 @@ class _CRG(LiteXModule):
|
||||||
# BaseSoC ------------------------------------------------------------------------------------------
|
# BaseSoC ------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
class BaseSoC(SoCCore):
|
class BaseSoC(SoCCore):
|
||||||
mem_map = {"csr": 0xA000_0000} # default GP0 address on ZynqMP
|
|
||||||
|
|
||||||
def __init__(self, sys_clk_freq=100e6, with_led_chaser=True, **kwargs):
|
def __init__(self, sys_clk_freq=100e6, with_led_chaser=True, **kwargs):
|
||||||
platform = xilinx_zcu216.Platform()
|
platform = xilinx_zcu216.Platform()
|
||||||
|
|
||||||
|
|
@ -108,13 +106,6 @@ class BaseSoC(SoCCore):
|
||||||
'PSU__UART0__PERIPHERAL__IO' : 'MIO 18 .. 19',
|
'PSU__UART0__PERIPHERAL__IO' : 'MIO 18 .. 19',
|
||||||
})
|
})
|
||||||
|
|
||||||
# Connect Zynq AXI master to the SoC
|
|
||||||
wb_gp0 = wishbone.Interface()
|
|
||||||
self.submodules += axi.AXI2Wishbone(
|
|
||||||
axi = self.cpu.add_axi_gp_master(),
|
|
||||||
wishbone = wb_gp0,
|
|
||||||
base_address = self.mem_map["csr"])
|
|
||||||
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
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue