aboutsummaryrefslogtreecommitdiffstats
path: root/techlibs/ice40
diff options
context:
space:
mode:
authorEddie Hung <eddie@fpgeh.com>2019-08-30 10:30:46 -0700
committerEddie Hung <eddie@fpgeh.com>2019-08-30 10:30:46 -0700
commitf0fef90e9d50632026ec68c573cfdb730100c26a (patch)
tree89c52eb853368a55762d9a3bdefd7ef525041840 /techlibs/ice40
parentc4e53108230c246ecf1b014b11c240b71ed39a8a (diff)
parenta94a8f3e4030b3a4697c2201ef65c83b01f25ffb (diff)
downloadyosys-f0fef90e9d50632026ec68c573cfdb730100c26a.tar.gz
yosys-f0fef90e9d50632026ec68c573cfdb730100c26a.tar.bz2
yosys-f0fef90e9d50632026ec68c573cfdb730100c26a.zip
Merge remote-tracking branch 'origin/master' into xaig_arrival
Diffstat (limited to 'techlibs/ice40')
-rw-r--r--techlibs/ice40/abc_hx.box2
-rw-r--r--techlibs/ice40/abc_lp.box2
-rw-r--r--techlibs/ice40/abc_u.box2
3 files changed, 3 insertions, 3 deletions
diff --git a/techlibs/ice40/abc_hx.box b/techlibs/ice40/abc_hx.box
index 571152129..3ea70bc91 100644
--- a/techlibs/ice40/abc_hx.box
+++ b/techlibs/ice40/abc_hx.box
@@ -8,6 +8,6 @@
# (NB: carry chain input/output must be last
# input/output and have been moved there
# overriding the alphabetical ordering)
-$__ICE40_FULL_ADDER 1 1 5 2
+$__ICE40_CARRY_WRAPPER 1 1 5 2
400 379 449 316 316
259 231 - - 126
diff --git a/techlibs/ice40/abc_lp.box b/techlibs/ice40/abc_lp.box
index a9f8699fc..473e92fe9 100644
--- a/techlibs/ice40/abc_lp.box
+++ b/techlibs/ice40/abc_lp.box
@@ -8,6 +8,6 @@
# (NB: carry chain input/output must be last
# input/output and have been moved there
# overriding the alphabetical ordering)
-$__ICE40_FULL_ADDER 1 1 5 2
+$__ICE40_CARRY_WRAPPER 1 1 5 2
589 558 661 465 465
675 609 - - 186
diff --git a/techlibs/ice40/abc_u.box b/techlibs/ice40/abc_u.box
index bc8a8d9cd..f00e247b8 100644
--- a/techlibs/ice40/abc_u.box
+++ b/techlibs/ice40/abc_u.box
@@ -8,6 +8,6 @@
# (NB: carry chain input/output must be last
# input/output and have been moved there
# overriding the alphabetical ordering)
-$__ICE40_FULL_ADDER 1 1 5 2
+$__ICE40_CARRY_WRAPPER 1 1 5 2
1231 1205 1285 874 874
675 609 - - 278