use new Record.connect omit parameter (replace leave_out)
authorFlorent Kermarrec <florent@enjoy-digital.fr>
Thu, 21 Apr 2016 07:39:21 +0000 (09:39 +0200)
committerFlorent Kermarrec <florent@enjoy-digital.fr>
Thu, 21 Apr 2016 07:39:21 +0000 (09:39 +0200)
litex/soc/cores/sdram/phy/s6ddrphy.py
litex/soc/interconnect/stream.py

index 71148bb6a729073638c949576c1a6e9c138dc952..8fe77a53c923e1dad51e8f7205f723041066b764 100644 (file)
@@ -451,14 +451,14 @@ class S6QuarterRateDDRPHY(Module):
         # DFI adaptation
 
         # Commands and writes
-        dfi_leave_out = set(["rddata", "rddata_valid", "wrdata_en"])
+        dfi_omit = set(["rddata", "rddata_valid", "wrdata_en"])
         self.comb += [
             If(~phase_sel,
-                self.dfi.phases[0].connect(half_rate_phy.dfi.phases[0], leave_out=dfi_leave_out),
-                self.dfi.phases[1].connect(half_rate_phy.dfi.phases[1], leave_out=dfi_leave_out),
+                self.dfi.phases[0].connect(half_rate_phy.dfi.phases[0], omit=dfi_omit),
+                self.dfi.phases[1].connect(half_rate_phy.dfi.phases[1], omit=dfi_omit),
             ).Else(
-                self.dfi.phases[2].connect(half_rate_phy.dfi.phases[0], leave_out=dfi_leave_out),
-                self.dfi.phases[3].connect(half_rate_phy.dfi.phases[1], leave_out=dfi_leave_out),
+                self.dfi.phases[2].connect(half_rate_phy.dfi.phases[0], omit=dfi_omit),
+                self.dfi.phases[3].connect(half_rate_phy.dfi.phases[1], omit=dfi_omit),
             ),
         ]
         wr_data_en = self.dfi.phases[self.settings.wrphase].wrdata_en & ~phase_sel
index a12562fd8d3d13c3d1e8e329ba727636b430489c..63f4c1f68d9653108f81c848233a73439f9d7108 100644 (file)
@@ -276,7 +276,7 @@ class Converter(Module):
         else:
             self.source = Endpoint([("data", nbits_to)])
             self.comb += converter.source.connect(self.source,
-                            leave_out=set(["valid_token_count"]))
+                            omit=set(["valid_token_count"]))
 
 
 class StrideConverter(Module):