mirror of
https://github.com/saymrwulf/litex-boards.git
synced 2026-11-21 09:54:20 +00:00
platforms,targets/xilinx_zc706: added choice between vivado(default) and openFPGALoader, re-enable DDR
This commit is contained in:
parent
3bd14f541e
commit
62b5b58aec
2 changed files with 19 additions and 15 deletions
|
|
@ -5,7 +5,7 @@
|
||||||
# SPDX-License-Identifier: BSD-2-Clause
|
# SPDX-License-Identifier: BSD-2-Clause
|
||||||
|
|
||||||
from litex.build.generic_platform import *
|
from litex.build.generic_platform import *
|
||||||
from litex.build.xilinx import Xilinx7SeriesPlatform
|
from litex.build.xilinx import Xilinx7SeriesPlatform, VivadoProgrammer
|
||||||
from litex.build.openfpgaloader import OpenFPGALoader
|
from litex.build.openfpgaloader import OpenFPGALoader
|
||||||
|
|
||||||
# IOs ----------------------------------------------------------------------------------------------
|
# IOs ----------------------------------------------------------------------------------------------
|
||||||
|
|
@ -394,8 +394,11 @@ class Platform(Xilinx7SeriesPlatform):
|
||||||
def __init__(self, toolchain="vivado"):
|
def __init__(self, toolchain="vivado"):
|
||||||
Xilinx7SeriesPlatform.__init__(self, "xc7z045ffg900-2", _io, _connectors, toolchain=toolchain)
|
Xilinx7SeriesPlatform.__init__(self, "xc7z045ffg900-2", _io, _connectors, toolchain=toolchain)
|
||||||
|
|
||||||
def create_programmer(self):
|
def create_programmer(self, name='vivado'):
|
||||||
return OpenFPGALoader("zc706")
|
if name == 'vivado':
|
||||||
|
return VivadoProgrammer()
|
||||||
|
else:
|
||||||
|
return OpenFPGALoader("zc706")
|
||||||
|
|
||||||
def do_finalize(self, fragment):
|
def do_finalize(self, fragment):
|
||||||
Xilinx7SeriesPlatform.do_finalize(self, fragment)
|
Xilinx7SeriesPlatform.do_finalize(self, fragment)
|
||||||
|
|
|
||||||
|
|
@ -103,16 +103,16 @@ class BaseSoC(SoCCore):
|
||||||
SoCCore.__init__(self, platform, sys_clk_freq, ident="LiteX SoC on ZC706", **kwargs)
|
SoCCore.__init__(self, platform, sys_clk_freq, ident="LiteX SoC on ZC706", **kwargs)
|
||||||
|
|
||||||
# DDR3 SDRAM -------------------------------------------------------------------------------
|
# DDR3 SDRAM -------------------------------------------------------------------------------
|
||||||
#if not self.integrated_main_ram_size:
|
if not self.integrated_main_ram_size:
|
||||||
# self.ddrphy = s7ddrphy.K7DDRPHY(platform.request("ddram"),
|
self.ddrphy = s7ddrphy.K7DDRPHY(platform.request("ddram"),
|
||||||
# memtype = "DDR3",
|
memtype = "DDR3",
|
||||||
# nphases = 4,
|
nphases = 4,
|
||||||
# sys_clk_freq = sys_clk_freq)
|
sys_clk_freq = sys_clk_freq)
|
||||||
# self.add_sdram("sdram",
|
self.add_sdram("sdram",
|
||||||
# phy = self.ddrphy,
|
phy = self.ddrphy,
|
||||||
# module = MT8JTF12864(sys_clk_freq, "1:4"),
|
module = MT8JTF12864(sys_clk_freq, "1:4"),
|
||||||
# l2_cache_size = kwargs.get("l2_size", 8192)
|
l2_cache_size = kwargs.get("l2_size", 8192)
|
||||||
# )
|
)
|
||||||
|
|
||||||
# Ethernet / Etherbone ---------------------------------------------------------------------
|
# Ethernet / Etherbone ---------------------------------------------------------------------
|
||||||
if with_ethernet or with_etherbone:
|
if with_ethernet or with_etherbone:
|
||||||
|
|
@ -148,6 +148,7 @@ def main():
|
||||||
from litex.build.parser import LiteXArgumentParser
|
from litex.build.parser import LiteXArgumentParser
|
||||||
parser = LiteXArgumentParser(platform=xilinx_zc706.Platform, description="LiteX SoC on ZC706.")
|
parser = LiteXArgumentParser(platform=xilinx_zc706.Platform, description="LiteX SoC on ZC706.")
|
||||||
parser.add_target_argument("--sys-clk-freq", default=125e6, type=float, help="System clock frequency.")
|
parser.add_target_argument("--sys-clk-freq", default=125e6, type=float, help="System clock frequency.")
|
||||||
|
parser.add_target_argument("--programmer", default="vivado", help="Programmer select from Vivado/openFPGALoader.")
|
||||||
parser.add_target_argument("--with-ethernet", action="store_true", help="Enable Ethernet support.")
|
parser.add_target_argument("--with-ethernet", action="store_true", help="Enable Ethernet support.")
|
||||||
parser.add_target_argument("--with-etherbone", action="store_true", help="Enable Etherbone support.")
|
parser.add_target_argument("--with-etherbone", action="store_true", help="Enable Etherbone support.")
|
||||||
parser.add_target_argument("--eth-ip", default="192.168.1.50", help="Ethernet/Etherbone IP address.")
|
parser.add_target_argument("--eth-ip", default="192.168.1.50", help="Ethernet/Etherbone IP address.")
|
||||||
|
|
@ -175,8 +176,8 @@ def main():
|
||||||
generate_litepcie_software(soc, os.path.join(builder.output_dir, "driver"))
|
generate_litepcie_software(soc, os.path.join(builder.output_dir, "driver"))
|
||||||
|
|
||||||
if args.load:
|
if args.load:
|
||||||
prog = soc.platform.create_programmer()
|
prog = soc.platform.create_programmer(args.programmer)
|
||||||
prog.load_bitstream(builder.get_bitstream_filename(mode="sram"))
|
prog.load_bitstream(builder.get_bitstream_filename(mode="sram"), device=1)
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
main()
|
main()
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue