From 1036ae4d3058a62eae67faad557827d673867fb5 Mon Sep 17 00:00:00 2001 From: Daniel Newbrook <dwn1c21@soton.ac.uk> Date: Thu, 23 Nov 2023 13:34:55 +0000 Subject: [PATCH] Restructured flists to remove DMA from QS --- flist/project/system.flist | 4 +--- flist/project/system_ASIC.flist | 3 --- flist/project/top.flist | 6 +++++- flist/project/top_ASIC.flist | 6 +++++- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/flist/project/system.flist b/flist/project/system.flist index baa34e1..e22286d 100644 --- a/flist/project/system.flist +++ b/flist/project/system.flist @@ -34,6 +34,4 @@ // - Bootrom Code RTL $(SOCLABS_PROJECT_DIR)/system/src/bootrom/verilog/bootrom.v -// the chosen DMA controller -//-f $(SOCLABS_SLDMA350_TECH_DIR)/flist/sldma350_ahb.flist --f $(SOCLABS_SLDMA230_TECH_DIR)/flist/sldma230_ip.flist + diff --git a/flist/project/system_ASIC.flist b/flist/project/system_ASIC.flist index c7f822c..dcd4389 100644 --- a/flist/project/system_ASIC.flist +++ b/flist/project/system_ASIC.flist @@ -28,6 +28,3 @@ // - Accelerator Wrapper IP -f $(SOCLABS_WRAPPER_TECH_DIR)/flist/accelerator_wrapper_ip.flist -// the chosen DMA controller --f $(SOCLABS_SLDMA350_TECH_DIR)/flist/sldma350_ahb.flist -//-f $(SOCLABS_SLDMA230_TECH_DIR)/flist/sldma230_ip.flist diff --git a/flist/project/top.flist b/flist/project/top.flist index c87d9be..0b24f7c 100644 --- a/flist/project/top.flist +++ b/flist/project/top.flist @@ -32,4 +32,8 @@ // - CMSDK IP -f $(SOCLABS_PROJECT_DIR)/flist/ahb/ahb_ip.flist --f $(SOCLABS_PROJECT_DIR)/flist/apb/apb_ip.flist \ No newline at end of file +-f $(SOCLABS_PROJECT_DIR)/flist/apb/apb_ip.flist + +// the chosen DMA controller +//-f $(SOCLABS_SLDMA350_TECH_DIR)/flist/sldma350_ahb.flist +-f $(SOCLABS_SLDMA230_TECH_DIR)/flist/sldma230_ip.flist \ No newline at end of file diff --git a/flist/project/top_ASIC.flist b/flist/project/top_ASIC.flist index 7b9d4f9..dd1da6c 100644 --- a/flist/project/top_ASIC.flist +++ b/flist/project/top_ASIC.flist @@ -31,4 +31,8 @@ -f $(SOCLABS_PROJECT_DIR)/flist/ahb/ahb_ip.flist -f $(SOCLABS_PROJECT_DIR)/flist/apb/apb_ip.flist -$(SOCLABS_PROJECT_DIR)/system/src/defines/gen_defines.v \ No newline at end of file +$(SOCLABS_PROJECT_DIR)/system/src/defines/gen_defines.v + +// the chosen DMA controller +-f $(SOCLABS_SLDMA350_TECH_DIR)/flist/sldma350_ahb.flist +//-f $(SOCLABS_SLDMA230_TECH_DIR)/flist/sldma230_ip.flist -- GitLab