aboutsummaryrefslogtreecommitdiffstats
path: root/ecp5
diff options
context:
space:
mode:
Diffstat (limited to 'ecp5')
-rw-r--r--ecp5/io.cc2
-rwxr-xr-xecp5/trellis_import.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/ecp5/io.cc b/ecp5/io.cc
index e86c84f6..908caaba 100644
--- a/ecp5/io.cc
+++ b/ecp5/io.cc
@@ -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: