Remove unused digilent_led_pmod.csv and add the marble_features.yaml …

…(should fix CI)
BerkeleyLab · Jan 9, 2025 · 6c8f099 · 6c8f099
1 parent aa6c745
commit 6c8f099
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 12 deletions.
diff --git a/projects/cmoc_top/marblemini/Makefile b/projects/cmoc_top/marblemini/Makefile
@@ -26,7 +26,7 @@ VFLAGS_DEP += -y$(BS_HARDWARE_DIR) -y$(BOARD_SUPPORT_DIR)/marblemini -y$(FPGA_FA
 
 VFLAGS += $(VERILOG_DEFINE_FLAGS)
 
-system_top.xdc: $(BOARD_SUPPORT_DIR)/$(HARDWARE)/Marble.xdc $(BOARD_SUPPORT_DIR)/$(HARDWARE)/pin_map.csv digilent_led_pmod.csv oscope_rules.csv
+system_top.xdc: $(BOARD_SUPPORT_DIR)/$(HARDWARE)/Marble.xdc $(BOARD_SUPPORT_DIR)/$(HARDWARE)/pin_map.csv oscope_rules.csv
 	@echo "Building for $(HARDWARE); Use make HARDWARE=marble(mini) otherwise"
 	$(PYTHON) $(BADGER_DIR)/tests/meta-xdc.py $^ > $@
 

diff --git a/projects/cmoc_top/marblemini/cmoc_top.v b/projects/cmoc_top/marblemini/cmoc_top.v
@@ -61,7 +61,7 @@ module cmoc_top(
 	output LD17,
 
 	// Physical Pmod
-	// Pmod1: use LED above with Digilent mapping
+	input [7:0] Pmod1,
 	input [7:0] Pmod2
 );
 

diff --git a/projects/cmoc_top/marblemini/digilent_led_pmod.csv b/projects/cmoc_top/marblemini/digilent_led_pmod.csv
diff --git a/projects/cmoc_top/marblemini/marble_features.yaml b/projects/cmoc_top/marblemini/marble_features.yaml
@@ -0,0 +1,24 @@
+# Defs are made available as Verilog defines
+# Params are made available as Verilog localparams and included in ROM metadata
+
+marblemini:
+    defs:
+        MARBLE_MINI: 1
+        USE_I2CBRIDGE: 1
+    params:
+        carrier: "Marble Mini"
+        carrier_rev: "v1"
+        default_enable_rx: 1
+        misc_config_default: 4
+        use_rgmii_idelay: 1
+
+marblev2:
+    defs:
+        MARBLE_V2: 1
+        USE_I2CBRIDGE: 1
+    params:
+        carrier: "Marble"
+        carrier_rev: "v2"
+        default_enable_rx: 1
+        misc_config_default: 4
+        use_rgmii_idelay: 1