Bump DMA to fix Vivado errors.

pulp-platform · May 1, 2024 · f0bee6d · f0bee6d
1 parent 997aa99
commit f0bee6d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Bender.lock b/Bender.lock
@@ -125,8 +125,8 @@ packages:
     dependencies:
     - common_cells
   idma:
-    revision: d6245c8bf8faa7a4d44325d6584387170413d53d
-    version: 0.6.0
+    revision: a600031b34ff77b8676ffa1c2369568fbfe4b24b
+    version: null
     source:
       Git: https://github.com/pulp-platform/iDMA.git
     dependencies:

diff --git a/Bender.yml b/Bender.yml
@@ -23,7 +23,7 @@ dependencies:
   common_cells:             { git: "https://github.com/pulp-platform/common_cells.git",           rev: bf98ae5e18 } # branch: master
   common_verification:      { git: "https://github.com/pulp-platform/common_verification.git",    version: 0.2.0  }
   cva6:                     { git: "https://github.com/pulp-platform/cva6.git",                   rev: "dbaecc5"  } # branch: astral
-  iDMA:                     { git: "https://github.com/pulp-platform/iDMA.git",                   version: 0.6.0  }
+  iDMA:                     { git: "https://github.com/pulp-platform/iDMA.git",                   rev: "a600031"  } # branch: cl/backend-tpl
   irq_router:               { git: "https://github.com/pulp-platform/irq_router.git",             version: 0.0.1-beta.1 }
   opentitan_peripherals:    { git: "https://github.com/pulp-platform/opentitan_peripherals.git",  version: 0.4.0  }
   redundancy_cells:         { git: "https://github.com/pulp-platform/redundancy_cells.git",       rev: "c37bdb47" } # branch: astral_rebase

diff --git a/cheshire.mk b/cheshire.mk
@@ -118,9 +118,9 @@ $(CHS_TAGGER_DIR)/.generated:
 	$(MAKE) -C $(CHS_TAGGER_DIR) REGWIDTH=32 MAXPARTITION=$(MAXPARTITION) PATID_LEN=5 regs
 	@touch $@
 
-# iDMA 
-#include $(IDMA_ROOT)/idma.mk
-#$(IDMA_ROOT)/.generated: idma_hw_all
+# iDMA
+include $(IDMA_ROOT)/idma.mk
+$(IDMA_ROOT)/.generated: idma_hw_all
 $(IDMA_ROOT)/.generated: $(IDMA_ROOT)/target/rtl/idma_reg64_2d.hjson
 	flock -x $@ sh -c "cp $< $(dir $@)/target/rtl/; $(MAKE) -j1 otp" && touch $@
 
@@ -132,7 +132,7 @@ CHS_HW_ALL += $(AXI_VGA_ROOT)/.generated
 CHS_HW_ALL += $(CHS_SLINK_DIR)/.generated
 CHS_HW_ALL += $(CHS_LLC_DIR)/.generated
 CHS_HW_ALL += $(CHS_TAGGER_DIR)/.generated
-#CHS_HW_ALL += $(IDMA_ROOT)/.generated
+CHS_HW_ALL += $(IDMA_ROOT)/.generated
 
 #####################
 # Generate Boot ROM #