mirror of
https://github.com/saymrwulf/litex-boards.git
synced 2026-11-20 09:52:57 +00:00
arty_s7: fix copyrights, rename to arty_s7, various minor changes to make it similar to others targets.
This commit is contained in:
parent
0cee59c48f
commit
52c9648176
3 changed files with 51 additions and 47 deletions
|
|
@ -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
|
||||||
|
|
@ -30,7 +30,7 @@ _io = [
|
||||||
("user_sw", 0, Pins("H14"), IOStandard("LVCMOS33")),
|
("user_sw", 0, Pins("H14"), IOStandard("LVCMOS33")),
|
||||||
("user_sw", 1, Pins("H18"), IOStandard("LVCMOS33")),
|
("user_sw", 1, Pins("H18"), IOStandard("LVCMOS33")),
|
||||||
("user_sw", 2, Pins("G18"), IOStandard("LVCMOS33")),
|
("user_sw", 2, Pins("G18"), IOStandard("LVCMOS33")),
|
||||||
("user_sw", 3, Pins("M5"), IOStandard("SSTL135")),
|
("user_sw", 3, Pins("M5"), IOStandard("SSTL135")),
|
||||||
|
|
||||||
("user_btn", 0, Pins("G15"), IOStandard("LVCMOS33")),
|
("user_btn", 0, Pins("G15"), IOStandard("LVCMOS33")),
|
||||||
("user_btn", 1, Pins("K16"), IOStandard("LVCMOS33")),
|
("user_btn", 1, Pins("K16"), IOStandard("LVCMOS33")),
|
||||||
|
|
@ -47,7 +47,7 @@ _io = [
|
||||||
IOStandard("LVCMOS33")),
|
IOStandard("LVCMOS33")),
|
||||||
|
|
||||||
("spi", 0,
|
("spi", 0,
|
||||||
Subsignal("clk", Pins("G16")),
|
Subsignal("clk", Pins("G16")),
|
||||||
Subsignal("cs_n", Pins("H16")),
|
Subsignal("cs_n", Pins("H16")),
|
||||||
Subsignal("mosi", Pins("H17")),
|
Subsignal("mosi", Pins("H17")),
|
||||||
Subsignal("miso", Pins("K14")),
|
Subsignal("miso", Pins("K14")),
|
||||||
|
|
@ -62,16 +62,16 @@ _io = [
|
||||||
|
|
||||||
("spiflash4x", 0, # clock needs to be accessed through STARTUPE2
|
("spiflash4x", 0, # clock needs to be accessed through STARTUPE2
|
||||||
Subsignal("cs_n", Pins("M13")),
|
Subsignal("cs_n", Pins("M13")),
|
||||||
Subsignal("clk", Pins("D11")),
|
Subsignal("clk", Pins("D11")),
|
||||||
Subsignal("dq", Pins("K17", "K18", "L14", "M15")),
|
Subsignal("dq", Pins("K17", "K18", "L14", "M15")),
|
||||||
IOStandard("LVCMOS33")
|
IOStandard("LVCMOS33")
|
||||||
),
|
),
|
||||||
("spiflash", 0, # clock needs to be accessed through STARTUPE2
|
("spiflash", 0, # clock needs to be accessed through STARTUPE2
|
||||||
Subsignal("cs_n", Pins("M13")),
|
Subsignal("cs_n", Pins("M13")),
|
||||||
Subsignal("clk", Pins("D11")),
|
Subsignal("clk", Pins("D11")),
|
||||||
Subsignal("mosi", Pins("K17")),
|
Subsignal("mosi", Pins("K17")),
|
||||||
Subsignal("miso", Pins("K18")),
|
Subsignal("miso", Pins("K18")),
|
||||||
Subsignal("wp", Pins("L14")),
|
Subsignal("wp", Pins("L14")),
|
||||||
Subsignal("hold", Pins("M15")),
|
Subsignal("hold", Pins("M15")),
|
||||||
IOStandard("LVCMOS33")
|
IOStandard("LVCMOS33")
|
||||||
),
|
),
|
||||||
|
|
@ -84,8 +84,8 @@ _io = [
|
||||||
Subsignal("ba", Pins("V5 T1 U3"), IOStandard("SSTL135")),
|
Subsignal("ba", Pins("V5 T1 U3"), IOStandard("SSTL135")),
|
||||||
Subsignal("ras_n", Pins("U1"), IOStandard("SSTL135")),
|
Subsignal("ras_n", Pins("U1"), IOStandard("SSTL135")),
|
||||||
Subsignal("cas_n", Pins("V3"), IOStandard("SSTL135")),
|
Subsignal("cas_n", Pins("V3"), IOStandard("SSTL135")),
|
||||||
Subsignal("we_n", Pins("P7"), IOStandard("SSTL135")),
|
Subsignal("we_n", Pins("P7"), IOStandard("SSTL135")),
|
||||||
Subsignal("cs_n", Pins("R3"), IOStandard("SSTL135")),
|
Subsignal("cs_n", Pins("R3"), IOStandard("SSTL135")),
|
||||||
Subsignal("dm", Pins("K4 M3"), IOStandard("SSTL135")),
|
Subsignal("dm", Pins("K4 M3"), IOStandard("SSTL135")),
|
||||||
Subsignal("dq", Pins(
|
Subsignal("dq", Pins(
|
||||||
"K2 K3 L4 M6 K6 M4 L5 L6",
|
"K2 K3 L4 M6 K6 M4 L5 L6",
|
||||||
|
|
@ -100,8 +100,8 @@ _io = [
|
||||||
Misc("IN_TERM=UNTUNED_SPLIT_40")),
|
Misc("IN_TERM=UNTUNED_SPLIT_40")),
|
||||||
Subsignal("clk_p", Pins("R5"), IOStandard("DIFF_SSTL135")),
|
Subsignal("clk_p", Pins("R5"), IOStandard("DIFF_SSTL135")),
|
||||||
Subsignal("clk_n", Pins("T4"), IOStandard("DIFF_SSTL135")),
|
Subsignal("clk_n", Pins("T4"), IOStandard("DIFF_SSTL135")),
|
||||||
Subsignal("cke", Pins("T2"), IOStandard("SSTL135")),
|
Subsignal("cke", Pins("T2"), IOStandard("SSTL135")),
|
||||||
Subsignal("odt", Pins("P5"), IOStandard("SSTL135")),
|
Subsignal("odt", Pins("P5"), IOStandard("SSTL135")),
|
||||||
Subsignal("reset_n", Pins("J6"), IOStandard("SSTL135")),
|
Subsignal("reset_n", Pins("J6"), IOStandard("SSTL135")),
|
||||||
Misc("SLEW=FAST"),
|
Misc("SLEW=FAST"),
|
||||||
),
|
),
|
||||||
|
|
@ -116,16 +116,16 @@ _connectors = [
|
||||||
("pmodd", "V15 U12 V13 T12 T13 R11 T11 U11"),
|
("pmodd", "V15 U12 V13 T12 T13 R11 T11 U11"),
|
||||||
("ck_io", {
|
("ck_io", {
|
||||||
# Outer Digital Header
|
# Outer Digital Header
|
||||||
"ck_io0" : "L13",
|
"ck_io0" : "L13",
|
||||||
"ck_io1" : "N13",
|
"ck_io1" : "N13",
|
||||||
"ck_io2" : "L16",
|
"ck_io2" : "L16",
|
||||||
"ck_io3" : "R14",
|
"ck_io3" : "R14",
|
||||||
"ck_io4" : "T14",
|
"ck_io4" : "T14",
|
||||||
"ck_io5" : "R16",
|
"ck_io5" : "R16",
|
||||||
"ck_io6" : "R17",
|
"ck_io6" : "R17",
|
||||||
"ck_io7" : "V17",
|
"ck_io7" : "V17",
|
||||||
"ck_io8" : "R15",
|
"ck_io8" : "R15",
|
||||||
"ck_io9" : "T15",
|
"ck_io9" : "T15",
|
||||||
"ck_io10" : "H16",
|
"ck_io10" : "H16",
|
||||||
"ck_io11" : "H17",
|
"ck_io11" : "H17",
|
||||||
"ck_io12" : "K14",
|
"ck_io12" : "K14",
|
||||||
|
|
@ -158,23 +158,24 @@ _connectors = [
|
||||||
"ck_a5" : "D18",
|
"ck_a5" : "D18",
|
||||||
|
|
||||||
# Inner Analog Header as Digital IO
|
# Inner Analog Header as Digital IO
|
||||||
"ck_a6" : "B14",
|
"ck_a6" : "B14",
|
||||||
"ck_a7" : "A14",
|
"ck_a7" : "A14",
|
||||||
"ck_a8" : "D16",
|
"ck_a8" : "D16",
|
||||||
"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",
|
||||||
"vaux0_n" : "A13",
|
"vaux0_n" : "A13",
|
||||||
"vaux1_p" : "B15",
|
"vaux1_p" : "B15",
|
||||||
"vaux1_n" : "A15",
|
"vaux1_n" : "A15",
|
||||||
"vaux9_p" : "E12",
|
"vaux9_p" : "E12",
|
||||||
"vaux9_n" : "D12",
|
"vaux9_n" : "D12",
|
||||||
"vaux2_p" : "B17",
|
"vaux2_p" : "B17",
|
||||||
"vaux2_n" : "A17",
|
"vaux2_n" : "A17",
|
||||||
"vaux10_p" : "C17",
|
"vaux10_p" : "C17",
|
||||||
"vaux10_n" : "B18",
|
"vaux10_n" : "B18",
|
||||||
"vaux11_p" : "E16",
|
"vaux11_p" : "E16",
|
||||||
|
|
@ -185,13 +186,14 @@ _connectors = [
|
||||||
"vaux8_n" : "A14",
|
"vaux8_n" : "A14",
|
||||||
"vaux3_p" : "D16",
|
"vaux3_p" : "D16",
|
||||||
"vaux3_n" : "D17",
|
"vaux3_n" : "D17",
|
||||||
} ),
|
}
|
||||||
|
),
|
||||||
]
|
]
|
||||||
|
|
||||||
# Platform -----------------------------------------------------------------------------------------
|
# Platform -----------------------------------------------------------------------------------------
|
||||||
|
|
||||||
class Platform(XilinxPlatform):
|
class Platform(XilinxPlatform):
|
||||||
default_clk_name = "clk100"
|
default_clk_name = "clk100"
|
||||||
default_clk_period = 1e9/100e6
|
default_clk_period = 1e9/100e6
|
||||||
|
|
||||||
def __init__(self, variant="s7-50"):
|
def __init__(self, variant="s7-50"):
|
||||||
|
|
@ -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))
|
||||||
|
|
||||||
|
|
@ -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")
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue