Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/migen
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 646667213e35
Choose a base ref
...
head repository: m-labs/migen
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5253b0c06e3a
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Aug 18, 2015

  1. mibuild/xilinx/ise: update synthesis with yosis

    @enjoy-digital
    enjoy-digital committed Aug 18, 2015
    Copy the full SHA
    9210df9 View commit details

  2. migen/actorlib/packet: fix source.error in Depacketizer

    @enjoy-digital
    enjoy-digital committed Aug 18, 2015
    Copy the full SHA
    5253b0c View commit details
Showing with 3 additions and 15 deletions.
  1. +2 −14 mibuild/xilinx/ise.py
  2. +1 −1 migen/actorlib/packet.py
16 changes: 2 additions & 14 deletions mibuild/xilinx/ise.py
View file
Original file line number Diff line number Diff line change
@@ -69,24 +69,12 @@ def _run_yosys(device, sources, vincpaths, build_name):
incflags = ""
for path in vincpaths:
incflags += " -I" + path
for filename, language in sources:
for filename, language, library in sources:
ys_contents += "read_{}{} {}\n".format(language, incflags, filename)

if device[:2] == "xc":
archcode = device[2:4]
else:
archcode = device[0:2]
arch = {
"6s": "spartan6",
"7a": "artix7",
"7k": "kintex7",
"7v": "virtex7",
"7z": "zynq7000"
}[archcode]

ys_contents += """hierarchy -check -top top
proc; memory; opt; fsm; opt
synth_xilinx -arch {arch} -top top -edif {build_name}.edif""".format(arch=arch, build_name=build_name)
synth_xilinx -top top -edif {build_name}.edif""".format(build_name=build_name)

ys_name = build_name + ".ys"
tools.write_to_file(ys_name, ys_contents)
2 changes: 1 addition & 1 deletion migen/actorlib/packet.py
View file
Original file line number Diff line number Diff line change
@@ -284,7 +284,7 @@ def __init__(self, sink_description, source_description, header):
)

if hasattr(sink, "error"):
self.comb += source_error.eq(sink.error)
self.comb += source.error.eq(sink.error)
self.comb += [
source.eop.eq(sink.eop | no_payload),
source.data.eq(sink.data),