From 9174bfe24940ec6296af063c5ec63f4dcabf79b8 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 17 Jan 2022 12:18:33 +0000 Subject: [PATCH] mv flist to soc folder --- demo/helloworld/Makefile | 12 ++++++------ {demo/helloworld => soc}/flist | 0 2 files changed, 6 insertions(+), 6 deletions(-) rename {demo/helloworld => soc}/flist (100%) diff --git a/demo/helloworld/Makefile b/demo/helloworld/Makefile index ab031cb..6709487 100644 --- a/demo/helloworld/Makefile +++ b/demo/helloworld/Makefile @@ -8,8 +8,8 @@ ABI = -mabi=ilp32 -march=rv32imc # Allow tool override VERILATOR = verilator -TESTDIR = ${PWD} -BUILD_DIR = ${TESTDIR}/build +DEMODIR = ${PWD} +BUILD_DIR = ${DEMODIR}/build RV_DESIGN = ${RV_ROOT}/design RV_SOC = ${RV_ROOT}/soc @@ -20,7 +20,7 @@ ifdef debug VERILATOR_DEBUG = --trace endif -LINK = $(TESTDIR)/link.ld +LINK = $(DEMODIR)/link.ld OFILES = $(TEST).o OUTFILES = $(TEST).out @@ -51,12 +51,12 @@ verilator-build: ${SOCFILES} ${BUILD_DIR}/defines.h test_soc_top.cpp echo '`undef ASSERT_ON' >> ${BUILD_DIR}/common_defines.vh $(VERILATOR) --cc -CFLAGS ${CFLAGS} $(defines) $(includes) \ -Wno-UNOPTFLAT \ - -I${TESTDIR} \ + -I${DEMODIR} \ -I${RV_SOC} \ - -f ${TESTDIR}/flist \ + -f ${RV_SOC}/flist \ ${SOCFILES} \ --top-module soc_top -exe test_soc_top.cpp --autoflush $(VERILATOR_DEBUG) - cp ${TESTDIR}/test_soc_top.cpp obj_dir + cp ${DEMODIR}/test_soc_top.cpp obj_dir $(MAKE) -j -C obj_dir/ -f Vsoc_top.mk $(VERILATOR_MAKE_FLAGS) ##################### Simulation Runs ##################################### diff --git a/demo/helloworld/flist b/soc/flist similarity index 100% rename from demo/helloworld/flist rename to soc/flist