---
misoc/integration/config.py | 2 +-
misoc/integration/soc_core.py | 6 +-----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/misoc/integration/config.py b/misoc/integration/config.py
index c04fc4d..13eeb42 100644
--- a/misoc/integration/config.py
+++ b/misoc/integration/config.py
@@ -2,7 +2,7 @@ from migen import *
from misoc.interconnect.csr import AutoCSR, CSRConstant
-class Config(Module, AutoCSR):
+class Config(AutoCSR):
def __setitem__(self, key, value):
setattr(self, key, CSRConstant(value, name=key))
diff --git a/misoc/integration/soc_core.py b/misoc/integration/soc_core.py
index c69b71b..8398284 100644
--- a/misoc/integration/soc_core.py
+++ b/misoc/integration/soc_core.py
@@ -72,7 +72,7 @@ class SoCCore(Module):
self._wb_masters = []
self._wb_slaves = []
- self.submodules.config = Config()
+ self.config = Config()
if cpu_type == "lm32":
self.submodules.cpu = lm32.LM32(platform, self.cpu_reset_address)
@@ -157,10 +157,6 @@ class SoCCore(Module):
def get_csr_regions(self):
return self._csr_regions
- def add_constant(self, name, value=None):
- warnings.warn("use CSRConstant and/or Config", DeprecationWarning)
- self._constants.append((name, value))
-
def get_constants(self):
r = []
for name, interrupt in sorted(self.interrupt_map.items(),
key=itemgetter(1)):
--
1.9.1
_______________________________________________
M-Labs devel mailing list
https://ssl.serverraum.org/lists/listinfo/devel
