diff options
| author | Eddie Hung <eddie.hung+gitlab@gmail.com> | 2018-07-28 19:52:17 +0000 |
|---|---|---|
| committer | Eddie Hung <eddie.hung+gitlab@gmail.com> | 2018-07-28 19:52:17 +0000 |
| commit | 7c1a7e7596cfdf1718e8c479cb281a3cedf0ec57 (patch) | |
| tree | 6f21160deed301364cd866adf9d8dd2244e7c995 /ecp5 | |
| parent | 48b9d05d85dd2192b194cc7f931dfd2ac7663778 (diff) | |
| parent | 0eaa92bd6a160696c2f221501d610c99d9231bef (diff) | |
| download | nextpnr-7c1a7e7596cfdf1718e8c479cb281a3cedf0ec57.tar.gz nextpnr-7c1a7e7596cfdf1718e8c479cb281a3cedf0ec57.tar.bz2 nextpnr-7c1a7e7596cfdf1718e8c479cb281a3cedf0ec57.zip | |
Merge branch 'redist_slack' into 'redist_slack'
Redist slack
See merge request eddiehung/nextpnr!13
Diffstat (limited to 'ecp5')
| -rw-r--r-- | ecp5/io.cc | 2 | ||||
| -rwxr-xr-x | ecp5/trellis_import.py | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -209,7 +209,7 @@ bool valid_loc_for_io(IOType type, PortType dir, IOSide side, int z) return false; if (is_differential(type) && (!is_lr || ((z % 2) == 1))) return false; - if ((type == IOType::LVCMOS18D || type == IOType::LVDS) && (dir == PORT_OUT || PORT_INOUT) && z != 0) + if ((type == IOType::LVCMOS18D || type == IOType::LVDS) && (dir == PORT_OUT || dir == PORT_INOUT) && z != 0) return false; return true; } diff --git a/ecp5/trellis_import.py b/ecp5/trellis_import.py index cf12e775..9a4f30ab 100755 --- a/ecp5/trellis_import.py +++ b/ecp5/trellis_import.py @@ -45,7 +45,8 @@ class BinaryBlobAssembler: print("ref %s %s" % (name, comment)) def s(self, s, comment): - print("str %s" % s) + assert "|" not in s + print("str |%s| %s" % (s, comment)) def u8(self, v, comment): if comment is None: |