From 8e190efed0e1a5edbcb7448c3d6ca59033f59717 Mon Sep 17 00:00:00 2001 From: colin Date: Tue, 15 Feb 2022 08:27:53 +0000 Subject: [PATCH] Split from soc.mk to soc_sim.mk and soc_top.mk --- Cores-SweRV/demo/helloworld/Makefile | 3 ++- Cores-SweRV/demo/jtag/Makefile | 3 ++- Cores-SweRV/soc/soc_sim.mk | 9 +++++++++ Cores-SweRV/soc/{soc.mk => soc_top.mk} | 20 +++++--------------- 4 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 Cores-SweRV/soc/soc_sim.mk rename Cores-SweRV/soc/{soc.mk => soc_top.mk} (79%) diff --git a/Cores-SweRV/demo/helloworld/Makefile b/Cores-SweRV/demo/helloworld/Makefile index 1cb5fa6..710bd54 100644 --- a/Cores-SweRV/demo/helloworld/Makefile +++ b/Cores-SweRV/demo/helloworld/Makefile @@ -39,7 +39,8 @@ verilator-build: swerv_define $(BUILD_DIR)/common_defines.vh \ -I${BUILD_DIR} \ -Wno-UNOPTFLAT \ - -F ${RV_SOC}/soc.mk \ + -F ${RV_SOC}/soc_top.mk \ + -F ${RV_SOC}/soc_sim.mk \ $(RV_SOC)/soc_sim.sv \ --top-module soc_sim -exe test_soc_sim.cpp --autoflush $(VERILATOR_DEBUG) cp ${DEMODIR}/test_soc_sim.cpp obj_dir diff --git a/Cores-SweRV/demo/jtag/Makefile b/Cores-SweRV/demo/jtag/Makefile index dc3d102..416a0a4 100644 --- a/Cores-SweRV/demo/jtag/Makefile +++ b/Cores-SweRV/demo/jtag/Makefile @@ -42,7 +42,8 @@ verilator-build: swerv_define $(BUILD_DIR)/common_defines.vh \ -I${BUILD_DIR} \ -Wno-UNOPTFLAT \ - -F ${RV_SOC}/soc.mk \ + -F ${RV_SOC}/soc_top.mk \ + -F ${RV_SOC}/soc_sim.mk \ $(RV_SOC)/soc_sim.sv \ --top-module soc_sim -exe test_soc_sim.cpp --autoflush $(VERILATOR_DEBUG) cp ${DEMODIR}/test_soc_sim.cpp obj_dir diff --git a/Cores-SweRV/soc/soc_sim.mk b/Cores-SweRV/soc/soc_sim.mk new file mode 100644 index 0000000..122456d --- /dev/null +++ b/Cores-SweRV/soc/soc_sim.mk @@ -0,0 +1,9 @@ +-I../design/include +-I./ + +-CFLAGS -lpthread +-LDFLAGS -lpthread + +./dpi/common/tcp_server.c +./dpi/jtagdpi/jtagdpi.sv +./dpi/jtagdpi/jtagdpi.c diff --git a/Cores-SweRV/soc/soc.mk b/Cores-SweRV/soc/soc_top.mk similarity index 79% rename from Cores-SweRV/soc/soc.mk rename to Cores-SweRV/soc/soc_top.mk index 1aa2618..9e67d07 100644 --- a/Cores-SweRV/soc/soc.mk +++ b/Cores-SweRV/soc/soc_top.mk @@ -38,20 +38,10 @@ ../design/dmi/dmi_wrapper.v ../design/dmi/dmi_jtag_to_core_sync.v ../design/dmi/rvjtag_tap.sv --v ../design/lib/beh_lib.sv --v ../design/lib/mem_lib.sv --v ../design/lib/ahb_to_axi4.sv --v ../design/lib/axi4_to_ahb.sv +../design/lib/beh_lib.sv +../design/lib/mem_lib.sv +../design/lib/ahb_to_axi4.sv +../design/lib/axi4_to_ahb.sv ./ahb_sif.sv -./soc_top.sv - --I../design/include --I./ - --CFLAGS -lpthread --LDFLAGS -lpthread - -./dpi/common/tcp_server.c -./dpi/jtagdpi/jtagdpi.sv -./dpi/jtagdpi/jtagdpi.c +./soc_top.sv \ No newline at end of file