From 28a41a2f603adb7f350d88fe6378f461b4ffcc33 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 18 Jan 2017 17:11:02 -0600 Subject: [PATCH] gateware: fix aeb1ba847 --- artiq/gateware/targets/kc705_dds.py | 1 - artiq/gateware/targets/kc705_drtio_master.py | 1 - artiq/gateware/targets/phaser.py | 1 - artiq/gateware/targets/pipistrello.py | 1 - 4 files changed, 4 deletions(-) diff --git a/artiq/gateware/targets/kc705_dds.py b/artiq/gateware/targets/kc705_dds.py index 226d9f6d7..dd6cafc6f 100755 --- a/artiq/gateware/targets/kc705_dds.py +++ b/artiq/gateware/targets/kc705_dds.py @@ -111,7 +111,6 @@ class _NIST_Ions(MiniSoC, AMPSoC): cpu_type=cpu_type, sdram_controller_type="minicon", l2_size=128*1024, - with_timer=False, ident=artiq_version, **kwargs) AMPSoC.__init__(self) diff --git a/artiq/gateware/targets/kc705_drtio_master.py b/artiq/gateware/targets/kc705_drtio_master.py index c46a2c1c0..f1b2f275b 100755 --- a/artiq/gateware/targets/kc705_drtio_master.py +++ b/artiq/gateware/targets/kc705_drtio_master.py @@ -32,7 +32,6 @@ class Master(MiniSoC, AMPSoC): cpu_type="or1k", sdram_controller_type="minicon", l2_size=128*1024, - with_timer=False, ident=artiq_version, **kwargs) AMPSoC.__init__(self) diff --git a/artiq/gateware/targets/phaser.py b/artiq/gateware/targets/phaser.py index 3509d2af9..e13efc579 100755 --- a/artiq/gateware/targets/phaser.py +++ b/artiq/gateware/targets/phaser.py @@ -168,7 +168,6 @@ class Phaser(MiniSoC, AMPSoC): cpu_type=cpu_type, sdram_controller_type="minicon", l2_size=128*1024, - with_timer=False, ident=artiq_version, **kwargs) AMPSoC.__init__(self) diff --git a/artiq/gateware/targets/pipistrello.py b/artiq/gateware/targets/pipistrello.py index 779b93da6..f7fc45a71 100755 --- a/artiq/gateware/targets/pipistrello.py +++ b/artiq/gateware/targets/pipistrello.py @@ -158,7 +158,6 @@ class Demo(BaseSoC, AMPSoC): BaseSoC.__init__(self, cpu_type=cpu_type, l2_size=64*1024, - with_timer=False, ident=artiq_version, clk_freq=75*1000*1000, **kwargs)