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/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7028d8525590
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4e5320be285e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 28, 2015

  1. adapt code to MiSoC's changes

    enjoy-digital authored and sbourdeauducq committed Feb 28, 2015
    Copy the full SHA
    9cf8db2 View commit details
  2. Copy the full SHA
    4e5320b View commit details
Showing with 3 additions and 2 deletions.
  1. +1 −1 soc/targets/artiq_kc705.py
  2. +2 −1 soc/targets/artiq_ppro.py
2 changes: 1 addition & 1 deletion soc/targets/artiq_kc705.py
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
from migen.bank import wbgen
from mibuild.generic_platform import *

from misoclib import gpio
from misoclib.cpu.peripherals import gpio
from targets.kc705 import BaseSoC

from artiqlib import rtio, ad9858
3 changes: 2 additions & 1 deletion soc/targets/artiq_ppro.py
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
from migen.bank import wbgen
from mibuild.generic_platform import *

from misoclib import gpio
from misoclib.cpu.peripherals import gpio
from targets.ppro import BaseSoC

from artiqlib import rtio, ad9858
@@ -97,6 +97,7 @@ def __init__(self, platform, cpu_type="or1k",
with_test_gen=False, **kwargs):
BaseSoC.__init__(self, platform,
cpu_type=cpu_type, ramcon_type=ramcon_type,
with_l2=with_l2,
**kwargs)
platform.add_extension(_tester_io)