mibuild/xilinx: export special_overrides dictionary

sbourdeauducq · sbourdeauducq · commit aef9275c9996 · 2015-03-14T10:45:11.000+01:00
diff --git a/mibuild/xilinx/common.py b/mibuild/xilinx/common.py
@@ -4,6 +4,8 @@
 from migen.fhdl.std import *
 from migen.fhdl.specials import SynthesisDirective
 from migen.genlib.cdc import *
+from migen.genlib.resetsync import AsyncResetSynchronizer
+from migen.genlib.io import *
 from mibuild import tools
 
 def settings(path, ver=None, sub=None):
@@ -81,3 +83,11 @@ class XilinxDifferentialOutput:
 	@staticmethod
 	def lower(dr):
 		return XilinxDifferentialOutputImpl(dr.i, dr.o_p, dr.o_n)
+
+xilinx_special_overrides = {
+	NoRetiming:					XilinxNoRetiming,
+	MultiReg:					XilinxMultiReg,
+	AsyncResetSynchronizer:		XilinxAsyncResetSynchronizer,
+	DifferentialInput:			XilinxDifferentialInput,
+	DifferentialOutput:			XilinxDifferentialOutput,
+}
diff --git a/mibuild/xilinx/platform.py b/mibuild/xilinx/platform.py
@@ -1,7 +1,3 @@
-from migen.genlib.cdc import *
-from migen.genlib.resetsync import AsyncResetSynchronizer
-from migen.genlib.io import *
-
 from mibuild.generic_platform import GenericPlatform
 from mibuild.xilinx import common, vivado, ise
 
@@ -18,20 +14,13 @@ def __init__(self, *args, toolchain="ise", **kwargs):
 			raise ValueError("Unknown toolchain")
 
 	def get_verilog(self, *args, special_overrides=dict(), **kwargs):
-		so = {
-			NoRetiming:					common.XilinxNoRetiming,
-			MultiReg:					common.XilinxMultiReg,
-			AsyncResetSynchronizer:		common.XilinxAsyncResetSynchronizer,
-			DifferentialInput:			common.XilinxDifferentialInput,
-			DifferentialOutput:			common.XilinxDifferentialOutput,
-		}
+		so = dict(common.xilinx_special_overrides)
 		so.update(special_overrides)
 		return GenericPlatform.get_verilog(self, *args, special_overrides=so, **kwargs)
 
 	def get_edif(self, fragment, **kwargs):
 		return GenericPlatform.get_edif(self, fragment, "UNISIMS", "Xilinx", self.device, **kwargs)
 
-
 	def build(self, *args, **kwargs):
 		return self.toolchain.build(self, *args, **kwargs)
 
