From 0127de9bb59fcc91738a66876a616a45cefd7c7c Mon Sep 17 00:00:00 2001 From: Joe Britton Date: Fri, 27 Feb 2015 15:02:28 -0700 Subject: [PATCH 1/2] soc: add_cpu_csr_region -> add_csr_region --- soc/targets/artiq_kc705.py | 2 +- soc/targets/artiq_ppro.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/soc/targets/artiq_kc705.py b/soc/targets/artiq_kc705.py index 99d75cb1f..67b080cd3 100644 --- a/soc/targets/artiq_kc705.py +++ b/soc/targets/artiq_kc705.py @@ -103,7 +103,7 @@ class ARTIQSoC(BaseSoC): rtio_csrs = self.rtio.get_csrs() self.submodules.rtiowb = wbgen.Bank(rtio_csrs) self.add_wb_slave(lambda a: a[26:29] == 2, self.rtiowb.bus) - self.add_cpu_csr_region("rtio", 0xa0000000, 32, rtio_csrs) + self.add_csr_region("rtio", 0xa0000000, 32, rtio_csrs) dds_pads = platform.request("dds") self.submodules.dds = ad9858.AD9858(dds_pads) diff --git a/soc/targets/artiq_ppro.py b/soc/targets/artiq_ppro.py index c7539e2c2..7d0f9c021 100644 --- a/soc/targets/artiq_ppro.py +++ b/soc/targets/artiq_ppro.py @@ -122,7 +122,7 @@ class ARTIQMiniSoC(BaseSoC): rtio_csrs = self.rtio.get_csrs() self.submodules.rtiowb = wbgen.Bank(rtio_csrs) self.add_wb_slave(lambda a: a[26:29] == 2, self.rtiowb.bus) - self.add_cpu_csr_region("rtio", 0xa0000000, 32, rtio_csrs) + self.add_csr_region("rtio", 0xa0000000, 32, rtio_csrs) if with_test_gen: self.submodules.test_gen = _TestGen(platform.request("ttl", 8)) From 7028d852559006d6b308b692fd86d2e868a5a339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Bourdeauducq?= Date: Fri, 27 Feb 2015 18:02:21 -0700 Subject: [PATCH 2/2] targets/ppro: disable L2 --- soc/targets/artiq_ppro.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/soc/targets/artiq_ppro.py b/soc/targets/artiq_ppro.py index 7d0f9c021..8c6749a46 100644 --- a/soc/targets/artiq_ppro.py +++ b/soc/targets/artiq_ppro.py @@ -92,7 +92,8 @@ class ARTIQMiniSoC(BaseSoC): } csr_map.update(BaseSoC.csr_map) - def __init__(self, platform, cpu_type="or1k", ramcon_type="minicon", + def __init__(self, platform, cpu_type="or1k", + ramcon_type="minicon", with_l2=False, with_test_gen=False, **kwargs): BaseSoC.__init__(self, platform, cpu_type=cpu_type, ramcon_type=ramcon_type,