Skip to content

Commit 27f3d6d

Browse files
committed
Merge remote-tracking branch 'origin/master' into develop-documentation
2 parents d475e9d + 98b5860 commit 27f3d6d

File tree

3 files changed

+2
-54
lines changed

3 files changed

+2
-54
lines changed

miscs/patches/ramulator.patch

-46
This file was deleted.

sim/rtlsim/Makefile

-7
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@ SRCS = $(COMMON_DIR)/util.cpp $(COMMON_DIR)/mem.cpp $(COMMON_DIR)/rvfloats.cpp $
3939
SRCS += $(DPI_DIR)/util_dpi.cpp $(DPI_DIR)/float_dpi.cpp
4040
SRCS += $(SRC_DIR)/processor.cpp
4141

42-
ifdef AXI_BUS
43-
TOP = Vortex_axi
44-
CXXFLAGS += -DAXI_BUS
45-
else
46-
TOP = Vortex
47-
endif
48-
4942
VL_FLAGS = --exe
5043
VL_FLAGS += --language 1800-2009 --assert -Wall -Wpedantic
5144
VL_FLAGS += -Wno-DECLFILENAME -Wno-REDEFMACRO

tests/regression/common.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ XRT_DEVICE_INDEX ?= 0
88
VORTEX_RT_PATH ?= $(ROOT_DIR)/runtime
99
VORTEX_KN_PATH ?= $(ROOT_DIR)/kernel
1010

11-
STARTUP_ADDR ?= 0x80000000
1211
ifeq ($(XLEN),64)
1312
VX_CFLAGS += -march=rv64imafd -mabi=lp64d
13+
STARTUP_ADDR ?= 0x180000000
1414
else
1515
VX_CFLAGS += -march=rv32imaf -mabi=ilp32f
16+
STARTUP_ADDR ?= 0x80000000
1617
endif
1718

1819
LLVM_CFLAGS += --sysroot=$(RISCV_SYSROOT)

0 commit comments

Comments
 (0)