update

2019-11-22 00:17:19 -05:00
parent d77a7e98a8 d4f6a7e3b2
commit 82ba8be98b
25 changed files with 225 additions and 430016 deletions
--- a/rtl/VX_define.v
+++ b/rtl/VX_define.v
@@ -11,8 +11,13 @@
 // `define ONLY

 // `define SYN 1
+<<<<<<< HEAD
 //`define ASIC 1
 //`define SYN_FUNC 1
+=======
+// `define ASIC 1
+// `define SYN_FUNC 1
+>>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798

 `define NUM_BARRIERS 4