Skip to content
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

remove double slashes #120

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

remove double slashes #120

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 sim/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ PROJ_DIR ?= $(PROJ_DIR_TMP)

# select the core to use as main processor (defaults to Ibex)
CORE ?= ibex
CORE_DIR := $(SIM_DIR)/../$(CORE)/
CORE_DIR := $(SIM_DIR)../$(CORE)/

# memory initialization files
PROG_PATHS ?= progs.txt
Expand All @@ -48,7 +48,7 @@ all: verilator

# vector coprocessor configuration file generation (defines VMEM_W and VREG_W)
VPROC_CONFIG_PKG := $(PROJ_DIR)/vproc_config.sv
include $(SIM_DIR)/../config.mk
include $(SIM_DIR)../config.mk

verilator-version-check:
@version=`verilator --version | awk '{print $$2}'`; \
Expand All @@ -66,7 +66,7 @@ verilator: verilator-version-check $(PROJ_DIR)/obj_dir/Vvproc_top.mk
$(abspath $(TRACE_VCD)) $(abspath $(TRACE_FST))

$(PROJ_DIR)/obj_dir/Vvproc_top.mk: verilator-version-check $(VPROC_CONFIG_PKG)
cp $(SIM_DIR)/verilator_main.cpp $(PROJ_DIR)/
cp $(SIM_DIR)verilator_main.cpp $(PROJ_DIR)/
cd $(PROJ_DIR); \
options=""; \
cflags=""; \
Expand Down Expand Up @@ -105,7 +105,7 @@ $(PROJ_DIR)/obj_dir/Vvproc_top.mk: verilator-version-check $(VPROC_CONFIG_PKG)
-Wno-UNSIGNED -Wno-IMPLICIT -Wno-LITENDIAN -Wno-CASEINCOMPLETE \
-Wno-SYMRSVDWORD -Wno-BLKANDNBLK -Wno-BLKSEQ -Wno-SYNCASYNCNET \
-Wno-COMBDLY \
-I$(SIM_DIR)/../rtl/ -I$(SIM_DIR)/../sva/ $$inc $$core \
-I$(SIM_DIR)../rtl/ -I$(SIM_DIR)../sva/ $$inc $$core \
-GMEM_W=$(MEM_W) -GVMEM_W=$(VMEM_W) \
-GICACHE_SZ=$(ICACHE_SZ) -GICACHE_LINE_W=$(ICACHE_LINE_W) \
-GDCACHE_SZ=$(DCACHE_SZ) -GDCACHE_LINE_W=$(DCACHE_LINE_W) \
Expand All @@ -115,7 +115,7 @@ $(PROJ_DIR)/obj_dir/Vvproc_top.mk: verilator-version-check $(VPROC_CONFIG_PKG)

vivado: $(VPROC_CONFIG_PKG)
cd $(PROJ_DIR) && vivado -mode batch -source $(VIVADO_TCL) \
-tclargs $(SIM_DIR)/../ $(CORE_DIR) $(VPROC_CONFIG_PKG) \
-tclargs $(SIM_DIR)../ $(CORE_DIR) $(VPROC_CONFIG_PKG) \
"MEM_W=$(MEM_W) MEM_SZ=$(MEM_SZ) MEM_LATENCY=$(MEM_LATENCY) \
VMEM_W=$(VMEM_W) \
ICACHE_SZ=$(ICACHE_SZ) ICACHE_LINE_W=$(ICACHE_LINE_W) \
Expand Down
10 changes: 5 additions & 5 deletions sw/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ifeq ($(COMPILER),gcc)
RISCV_DUMP := riscv32-unknown-elf-objdump
RISCV_OBCP := riscv32-unknown-elf-objcopy
ARCH := rv32imv
LD_SCRIPT := $(SW_DIR)/link.ld
LD_SCRIPT := $(SW_DIR)link.ld
else ifeq ($(COMPILER),llvm)
# Pick the first clang executable in $PATH with version >= 14, or the
# default clang if there is no clang >= 14; the individual steps are:
Expand All @@ -32,21 +32,21 @@ else ifeq ($(COMPILER),llvm)
RISCV_OBCP := llvm-objcopy
ARCH := rv32imzve32x
CC_SPECIFIC_OPTIONS := -fuse-ld=lld -Wno-unused-command-line-argument
LD_SCRIPT := $(SW_DIR)/lld_link.ld
LD_SCRIPT := $(SW_DIR)lld_link.ld
endif


RISCV_FLAGS := -march=$(ARCH) -mabi=ilp32 -static -mcmodel=medany \
-fvisibility=hidden -nostdlib -nostartfiles -Wall \
$(CC_SPECIFIC_OPTIONS)

CFLAGS := $(CFLAGS) -I$(SW_DIR)/lib/
CFLAGS := $(CFLAGS) -I$(SW_DIR)lib/

PROG ?= test
OBJ ?= test.o

# add crt0 to object files
RISCV_OBJ := $(SW_DIR)/crt0.o $(OBJ) $(SW_DIR)/lib/uart.o
RISCV_OBJ := $(SW_DIR)crt0.o $(OBJ) $(SW_DIR)lib/uart.o

all: $(PROG).vmem

Expand Down Expand Up @@ -77,4 +77,4 @@ $(PROG).elf: $(RISCV_OBJ) $(LD_SCRIPT)
clean:
rm -f *.o *.elf *.bin *.vmem

include $(SW_DIR)/toolchain.mk
include $(SW_DIR)toolchain.mk