From c3a56d32b1602b184e5cc27e0b93c8dd8045138f Mon Sep 17 00:00:00 2001 From: Michael Rogenmoser Date: Thu, 19 Nov 2020 17:24:48 +0100 Subject: [PATCH 1/2] add work directory symlink for compatibility to pulp built with bender --- rules/pulpos/default_rules.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rules/pulpos/default_rules.mk b/rules/pulpos/default_rules.mk index 654fa33..27a3f03 100644 --- a/rules/pulpos/default_rules.mk +++ b/rules/pulpos/default_rules.mk @@ -221,8 +221,13 @@ $(TARGET_BUILD_DIR)/tcl_files: $(TARGET_BUILD_DIR)/waves: ln -s $(VSIM_PATH)/waves $@ +$(TARGET_BUILD_DIR)/work: + ln -s $(VSIM_PATH)/work $@ -run: $(TARGET_BUILD_DIR)/modelsim.ini $(TARGET_BUILD_DIR)/boot $(TARGET_BUILD_DIR)/tcl_files $(TARGET_BUILD_DIR)/waves +run: $(TARGET_BUILD_DIR)/modelsim.ini $(TARGET_BUILD_DIR)/boot $(TARGET_BUILD_DIR)/tcl_files $(TARGET_BUILD_DIR)/waves +ifdef BENDER + $(MAKE) $(TARGET_BUILD_DIR)/work +endif $(PULPRT_HOME)/bin/stim_utils.py --binary=$(TARGETS) --vectors=$(TARGET_BUILD_DIR)/vectors/stim.txt ifdef gui From 1b44f3beb9e402c394018dfa33dedfb1d6e0d2c4 Mon Sep 17 00:00:00 2001 From: Michael Rogenmoser Date: Fri, 20 Nov 2020 09:24:05 +0100 Subject: [PATCH 2/2] Cleanup symlink to remove dependency on `BENDER` variable --- rules/pulpos/default_rules.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/rules/pulpos/default_rules.mk b/rules/pulpos/default_rules.mk index 27a3f03..d3b211d 100644 --- a/rules/pulpos/default_rules.mk +++ b/rules/pulpos/default_rules.mk @@ -224,10 +224,8 @@ $(TARGET_BUILD_DIR)/waves: $(TARGET_BUILD_DIR)/work: ln -s $(VSIM_PATH)/work $@ -run: $(TARGET_BUILD_DIR)/modelsim.ini $(TARGET_BUILD_DIR)/boot $(TARGET_BUILD_DIR)/tcl_files $(TARGET_BUILD_DIR)/waves -ifdef BENDER - $(MAKE) $(TARGET_BUILD_DIR)/work -endif + +run: $(TARGET_BUILD_DIR)/modelsim.ini $(TARGET_BUILD_DIR)/boot $(TARGET_BUILD_DIR)/tcl_files $(TARGET_BUILD_DIR)/waves $(TARGET_BUILD_DIR)/work $(PULPRT_HOME)/bin/stim_utils.py --binary=$(TARGETS) --vectors=$(TARGET_BUILD_DIR)/vectors/stim.txt ifdef gui