merge fixes

Author: tinebp

docs/fpga_setup.md

@@ -39,13 +39,6 @@ SRCS = $(COMMON_DIR)/util.cpp $(COMMON_DIR)/mem.cpp $(COMMON_DIR)/rvfloats.cpp $
 SRCS += $(DPI_DIR)/util_dpi.cpp $(DPI_DIR)/float_dpi.cpp
 SRCS += $(SRC_DIR)/processor.cpp
 
-ifdef AXI_BUS
-	TOP = Vortex_axi
-	CXXFLAGS += -DAXI_BUS
-else
-	TOP = Vortex
-endif
-
 VL_FLAGS = --exe
 VL_FLAGS += --language 1800-2009 --assert -Wall -Wpedantic
 VL_FLAGS += -Wno-DECLFILENAME -Wno-REDEFMACRO

miscs/patches/ramulator.patch

@@ -8,11 +8,12 @@ XRT_DEVICE_INDEX ?= 0
 VORTEX_RT_PATH ?= $(ROOT_DIR)/runtime
 VORTEX_KN_PATH ?= $(ROOT_DIR)/kernel
 
-STARTUP_ADDR ?= 0x80000000
 ifeq ($(XLEN),64)
 VX_CFLAGS += -march=rv64imafd -mabi=lp64d
+STARTUP_ADDR ?= 0x180000000
 else
 VX_CFLAGS += -march=rv32imaf -mabi=ilp32f
+STARTUP_ADDR ?= 0x80000000
 endif
 
 LLVM_CFLAGS += --sysroot=$(RISCV_SYSROOT)