Skip to content

Small quality-of-life fixes #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FrancescoConti merged 1 commit into from
Apr 16, 2024
Merged

Small quality-of-life fixes #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions rules/pulpos/default_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,35 +286,35 @@ ifndef VSIM_PATH
$(error "VSIM_PATH is undefined. Either call \
'source $$YOUR_HW_DIR/setup/vsim.sh' or set it manually.")
endif
ln -s $(VSIM_PATH)/modelsim.ini $@
ln -sfn $(VSIM_PATH)/modelsim.ini $@

$(TARGET_BUILD_DIR)/work:
ifndef VSIM_PATH
$(error "VSIM_PATH is undefined. Either call \
'source $$YOUR_HW_DIR/setup/vsim.sh' or set it manually.")
endif
ln -s $(VSIM_PATH)/work $@
ln -sfn $(VSIM_PATH)/work $@

$(TARGET_BUILD_DIR)/boot:
ifndef VSIM_PATH
$(error "VSIM_PATH is undefined. Either call \
'source $$YOUR_HW_DIR/setup/vsim.sh' or set it manually.")
endif
ln -s $(VSIM_PATH)/boot $@
ln -sfn $(VSIM_PATH)/boot $@

$(TARGET_BUILD_DIR)/tcl_files:
ifndef VSIM_PATH
$(error "VSIM_PATH is undefined. Either call \
'source $$YOUR_HW_DIR/setup/vsim.sh' or set it manually.")
endif
ln -s $(VSIM_PATH)/tcl_files $@
ln -sfn $(VSIM_PATH)/tcl_files $@

$(TARGET_BUILD_DIR)/waves:
ifndef VSIM_PATH
$(error "VSIM_PATH is undefined. Either call \
'source $$YOUR_HW_DIR/setup/vsim.sh' or set it manually.")
endif
ln -s $(VSIM_PATH)/waves $@
ln -sfn $(VSIM_PATH)/waves $@

$(TARGET_BUILD_DIR)/stdout:
mkdir -p $@
Expand Down
10 changes: 8 additions & 2 deletions rules/pulpos/targets/carfield-cluster.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
HOSTNAME := $(shell hostname)
ETH_HOST = $(shell echo $(HOSTNAME) | grep -q "\.ee\.ethz\.ch$$" && echo 1 || echo 0)
ifeq (ETH_HOST,1)
QUESTA ?= questa-2022.3
else
QUESTA ?=
endif
ifdef USE_IBEX
PULP_LDFLAGS +=
PULP_CFLAGS += -D__ibex__ -U__riscv__ -UARCHI_CORE_HAS_PULPV2 -DRV_ISA_RV32
Expand Down Expand Up @@ -73,5 +79,5 @@ ifndef gui
vsim-flags = -c
endif

run:
$(QUESTA) vsim $(vsim-flags) -do "set VSIM_PATH $(VSIM_PATH); source $(VSIM_PATH)/scripts/start.tcl"
run: $(TARGETS)
cd $(TARGET_BUILD_DIR); $(QUESTA) vsim $(vsim-flags) -do "set VSIM_PATH $(VSIM_PATH); source $(VSIM_PATH)/scripts/start.tcl"