start running and debugging

diff --git a/mk/synthesis-yosys.mk b/mk/synthesis-yosys.mk
index 7a5f0a56fe398412158a4e9461662a7f91429892..89ae3f0f04edd045fd46791bc1754f1c69583694 100644 (file)
--- a/mk/synthesis-yosys.mk
+++ b/mk/synthesis-yosys.mk
@@ -1,9 +1,9 @@
 
  $(info Logical synthesis is using Yosys.)
 
- #ifeq ($(YOSYS_TOP),)
- #  $(error YOSYS_TOP has not been set)
- #endif
+ ifeq ($(YOSYS_TOP),)
+   $(error YOSYS_TOP has not been set)
+ endif
 
  ifeq ($(LIBERTY_FILE),)
   $(error LIBERTY_FILE has not been set)
@@ -53,5 +53,5 @@
         echo "yosys write_blif $*.blif"                    >> $*.tcl;
         yosys -c $*.tcl
 
-#$(addsuffix .vst,$(NETLISTS_SYNTH)): $(VLOG_MODULE).blif
-#      -@$(call run_if_older,$@,$(VLOG_MODULE).blif,$(call scl_cols,eval `$(CORIOLIS_TOP)/etc/coriolis2/coriolisEnv.py $(DEBUG_OPTION)`; $(BLIF2VST) $(VST_FLAGS) --cell=$(VLOG_MODULE)) )
+$(addsuffix .vst,$(NETLISTS_SYNTH)): $(VLOG_MODULE).blif
+       -@$(call run_if_older,$@,$(VLOG_MODULE).blif,$(call scl_cols,eval `$(CORIOLIS_TOP)/etc/coriolis2/coriolisEnv.py $(DEBUG_OPTION)`; $(BLIF2VST) $(VST_FLAGS) --cell=$(VLOG_MODULE)) )

diff --git a/mksym.sh b/mksym.sh
index 47de995202135c4de24c6ef22459f97cc1ed7764..b5da0a1ee86c6a5aecebf40b9278723b23e98126 100755 (executable)
--- a/mksym.sh
+++ b/mksym.sh
@@ -1,8 +1,11 @@
 #!/bin/bash
 
+ALLIANCE_TOOLKIT=${ALLIANCE_TOOLKIT:-${HOME}/alliance-check-toolkit/}
+
 echo "creating symlinks"
 
 mkdir -p mk/dks.d
+mkdir -p mk/users.d
 
 declare -a ScriptsArray=("os" "users" "binaries" "alliance"
         "design-flow" "pr-coriolis" "pr-alliance" "pr-hibikino"
@@ -11,17 +14,28 @@ declare -a ScriptsArray=("os" "users" "binaries" "alliance"
 for script in "${ScriptsArray[@]}"; do
     if [ ! -L "mk/$script.mk" ]; then
         echo "link" mk/$script.mk
-        ln -s mk/$ALLIANCE_TOP/$script.mk mk/$script.mk
+        ln -s $ALLIANCE_TOOLKIT/etc/mk/$script.mk mk/$script.mk
     fi
 done
 
-declare -a LibsArray=("sxlib" "nsxlib" "nxslib45"
+declare -a LibsArray=("sxlib" "nsxlib" "nsxlib45" "cmos"
 )
 
 for script in "${LibsArray[@]}"; do
     if [ ! -L "mk/dks.d/$script.mk" ]; then
         echo "link" mk/dks.d/$script.mk
-        ln -s mk/$ALLIANCE_TOP/$script.mk mk/dks.d/$script.mk
+        ln -s $ALLIANCE_TOOLKIT/etc/mk/dks.d/$script.mk mk/dks.d/$script.mk
+    fi
+done
+
+declare -a UsersArray=("lkcl"
+)
+
+for script in "${UsersArray[@]}"; do
+    if [ ! -L "mk/users.d/$script.mk" ]; then
+        echo "link" mk/users.d/user-$script.mk
+        ln -s $ALLIANCE_TOOLKIT/etc/mk/users.d/user-$script.mk \
+               mk/users.d/user-$script.mk
     fi
 done
 

diff --git a/nets.txt b/nets.txt
index 20708eab6ec510698bd12343cfe5f3a35c7bc952..c8ae834dfc9943a4bcc2cdac0f787ead7bbb0020 100644 (file)
--- a/nets.txt
+++ b/nets.txt
@@ -1,3 +1,4 @@
+part_sig_add
 mux0
 mux1
 mux2
@@ -42,4 +43,3 @@ ripple$27
 add3
 ls1
 pmux1
-part_sig_add