arty_s7: fix copyrights, rename to arty_s7, various minor changes to make it similar to others targets.

This commit is contained in:
Florent Kermarrec 2020-04-13 15:20:36 +02:00
parent 0cee59c48f
commit 52c9648176
3 changed files with 51 additions and 47 deletions

View file

@ -1,5 +1,5 @@
# This file is Copyright (c) 2015 Yann Sionneau <yann.sionneau@gmail.com> # This file is Copyright (c) 2018 William D. Jones <thor0505@comcast.net>
# This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr> # This file is Copyright (c) 2020 Staf Verhaegen <staf@fibraservi.eu>
# License: BSD # License: BSD
from litex.build.generic_platform import Pins, Subsignal, IOStandard, Misc from litex.build.generic_platform import Pins, Subsignal, IOStandard, Misc
@ -164,7 +164,8 @@ _connectors = [
"ck_a9" : "D17", "ck_a9" : "D17",
"ck_a10" : "D14", "ck_a10" : "D14",
"ck_a11" : "D15", "ck_a11" : "D15",
} ), }
),
("XADC", { ("XADC", {
# Outer Analog Header # Outer Analog Header
"vaux0_p" : "B13", "vaux0_p" : "B13",
@ -185,7 +186,8 @@ _connectors = [
"vaux8_n" : "A14", "vaux8_n" : "A14",
"vaux3_p" : "D16", "vaux3_p" : "D16",
"vaux3_n" : "D17", "vaux3_n" : "D17",
} ), }
),
] ]
# Platform ----------------------------------------------------------------------------------------- # Platform -----------------------------------------------------------------------------------------

View file

@ -1,20 +1,20 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>, # This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>,
# Copyright (c) 2020 Staf Verhaegen <staf@fibraservi.eu> # This file is Copyright (c) 2020 Staf Verhaegen <staf@fibraservi.eu>
# License: BSD # License: BSD
import argparse import argparse
from migen import Module, ClockDomain from migen import *
from ..platforms import artys7 from litex_boards.platforms import arty_s7
from litex.build.xilinx.vivado import vivado_build_args, vivado_build_argdict from litex.build.xilinx.vivado import vivado_build_args, vivado_build_argdict
from litex.soc.cores.clock import S7PLL, S7IDELAYCTRL from litex.soc.cores.clock import *
from litex.soc.integration.soc_core import SoCCore from litex.soc.integration.soc_core import *
from litex.soc.integration.soc_sdram import soc_sdram_args, soc_sdram_argdict from litex.soc.integration.soc_sdram import *
from litex.soc.integration.builder import Builder, builder_args, builder_argdict from litex.soc.integration.builder import *
from litedram.modules import MT41K128M16 from litedram.modules import MT41K128M16
from litedram.phy import s7ddrphy from litedram.phy import s7ddrphy
@ -46,7 +46,7 @@ class _CRG(Module):
class BaseSoC(SoCCore): class BaseSoC(SoCCore):
def __init__(self, sys_clk_freq=int(100e6), **kwargs): def __init__(self, sys_clk_freq=int(100e6), **kwargs):
platform = artys7.Platform() platform = arty_s7.Platform()
# SoCCore ---------------------------------------------------------------------------------- # SoCCore ----------------------------------------------------------------------------------
SoCCore.__init__(self, platform, clk_freq=sys_clk_freq, **kwargs) SoCCore.__init__(self, platform, clk_freq=sys_clk_freq, **kwargs)
@ -81,8 +81,7 @@ def main():
vivado_build_args(parser) vivado_build_args(parser)
args = parser.parse_args() args = parser.parse_args()
soc = BaseSoC(with_ethernet=False, with_etherbone=False, soc = BaseSoC(**soc_sdram_argdict(args))
**soc_sdram_argdict(args))
builder = Builder(soc, **builder_argdict(args)) builder = Builder(soc, **builder_argdict(args))
builder.build(**vivado_build_argdict(args)) builder.build(**vivado_build_argdict(args))

View file

@ -36,6 +36,9 @@ class TestTargets(unittest.TestCase):
platforms.append("pipistrello") platforms.append("pipistrello")
platforms.append("sp605") platforms.append("sp605")
# Xilinx Spartan7
platforms.append("arty_s7")
# Xilinx Artix7 # Xilinx Artix7
platforms.append("ac701") platforms.append("ac701")
platforms.append("aller") platforms.append("aller")