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/misoc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6683485841b4
Choose a base ref
...
head repository: m-labs/misoc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 63538a7d04c1
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Aug 18, 2015

  1. liteeth/phy: only use clk_freq for LiteEthPHYGMIIMII in autodetect

    @enjoy-digital
    enjoy-digital committed Aug 18, 2015

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3d3cd12 View commit details

  2. litecores: add -Ob option to make.py (allow to build with yosys for e… 

    …xample)
    @enjoy-digital
    enjoy-digital committed Aug 18, 2015
    Copy the full SHA
    63538a7 View commit details
4 changes: 3 additions & 1 deletion misoclib/com/liteeth/example_designs/make.py
View file
Original file line number Diff line number Diff line change
@@ -46,6 +46,7 @@ def _get_args():
parser.add_argument("-p", "--platform", default=None, help="platform to build for")
parser.add_argument("-Ot", "--target-option", default=[], nargs=2, action="append", help="set target-specific option")
parser.add_argument("-Op", "--platform-option", default=[], nargs=2, action="append", help="set platform-specific option")
parser.add_argument("-Ob", "--build-option", default=[], nargs=2, action="append", help="set build option")
parser.add_argument("--csr_csv", default="./test/csr.csv", help="CSV file to save the CSR map into")

parser.add_argument("action", nargs="+", help="specify an action")
@@ -134,7 +135,8 @@ def _get_args():
write_to_file(args.csr_csv, csr_csv)

if actions["build-bitstream"]:
vns = platform.build(soc, build_name=build_name)
build_kwargs = dict((k, autotype(v)) for k, v in args.build_option)
vns = platform.build(soc, build_name=build_name, **build_kwargs)
if hasattr(soc, "do_exit") and vns is not None:
if hasattr(soc.do_exit, '__call__'):
soc.do_exit(vns)
3 changes: 2 additions & 1 deletion misoclib/com/liteeth/phy/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@


def LiteEthPHY(clock_pads, pads, **kwargs):
clk_freq = kwargs.pop("clk_freq")
# Autodetect PHY
if hasattr(pads, "source_stb"):
# This is a simulation PHY
@@ -11,7 +12,7 @@ def LiteEthPHY(clock_pads, pads, **kwargs):
if hasattr(clock_pads, "tx"):
# This is a 10/100/1G PHY
from misoclib.com.liteeth.phy.gmii_mii import LiteEthPHYGMIIMII
return LiteEthPHYGMIIMII(clock_pads, pads, **kwargs)
return LiteEthPHYGMIIMII(clock_pads, pads, clk_freq=clk_freq, **kwargs)
else:
# This is a pure 1G PHY
from misoclib.com.liteeth.phy.gmii import LiteEthPHYGMII
4 changes: 3 additions & 1 deletion misoclib/com/liteusb/example_designs/make.py
View file
Original file line number Diff line number Diff line change
@@ -46,6 +46,7 @@ def _get_args():
parser.add_argument("-p", "--platform", default=None, help="platform to build for")
parser.add_argument("-Ot", "--target-option", default=[], nargs=2, action="append", help="set target-specific option")
parser.add_argument("-Op", "--platform-option", default=[], nargs=2, action="append", help="set platform-specific option")
parser.add_argument("-Ob", "--build-option", default=[], nargs=2, action="append", help="set build option")
parser.add_argument("--csr_csv", default="./test/csr.csv", help="CSV file to save the CSR map into")

parser.add_argument("action", nargs="+", help="specify an action")
@@ -128,7 +129,8 @@ def _get_args():
write_to_file(args.csr_csv, csr_csv)

if actions["build-bitstream"]:
vns = platform.build(soc, build_name=build_name, run=True)
build_kwargs = dict((k, autotype(v)) for k, v in args.build_option)
vns = platform.build(soc, build_name=build_name, **build_kwargs)
if hasattr(soc, "do_exit") and vns is not None:
if hasattr(soc.do_exit, '__call__'):
soc.do_exit(vns)
4 changes: 3 additions & 1 deletion misoclib/mem/litesata/example_designs/make.py
View file
Original file line number Diff line number Diff line change
@@ -46,6 +46,7 @@ def _get_args():
parser.add_argument("-p", "--platform", default=None, help="platform to build for")
parser.add_argument("-Ot", "--target-option", default=[], nargs=2, action="append", help="set target-specific option")
parser.add_argument("-Op", "--platform-option", default=[("programmer", "vivado")], nargs=2, action="append", help="set platform-specific option")
parser.add_argument("-Ob", "--build-option", default=[], nargs=2, action="append", help="set build option")
parser.add_argument("--csr_csv", default="./test/csr.csv", help="CSV file to save the CSR map into")

parser.add_argument("action", nargs="+", help="specify an action")
@@ -149,7 +150,8 @@ def _get_args():
v_output.write("build/litesata.v")

if actions["build-bitstream"]:
vns = platform.build(soc, build_name=build_name, run=True)
build_kwargs = dict((k, autotype(v)) for k, v in args.build_option)
vns = platform.build(soc, build_name=build_name, **build_kwargs)
if hasattr(soc, "do_exit") and vns is not None:
if hasattr(soc.do_exit, '__call__'):
soc.do_exit(vns)
4 changes: 3 additions & 1 deletion misoclib/tools/litescope/example_designs/make.py
View file
Original file line number Diff line number Diff line change
@@ -46,6 +46,7 @@ def _get_args():
parser.add_argument("-p", "--platform", default=None, help="platform to build for")
parser.add_argument("-Ot", "--target-option", default=[], nargs=2, action="append", help="set target-specific option")
parser.add_argument("-Op", "--platform-option", default=[], nargs=2, action="append", help="set platform-specific option")
parser.add_argument("-Ob", "--build-option", default=[], nargs=2, action="append", help="set build option")
parser.add_argument("--csr_csv", default="./test/csr.csv", help="CSV file to save the CSR map into")

parser.add_argument("action", nargs="+", help="specify an action")
@@ -143,7 +144,8 @@ def _get_args():
write_to_file(args.csr_csv, csr_csv)

if actions["build-bitstream"]:
vns = platform.build(soc, build_name=build_name, run=True)
build_kwargs = dict((k, autotype(v)) for k, v in args.build_option)
vns = platform.build(soc, build_name=build_name, **build_kwargs)
if hasattr(soc, "do_exit") and vns is not None:
if hasattr(soc.do_exit, '__call__'):
soc.do_exit(vns)