integrate Pavel's new clkmgr code

2 files changed, 12 insertions, 7 deletions

diff --git a/eim/build/Makefile b/eim/build/Makefile
index ae8a5ad..562175d 100644
--- a/eim/build/Makefile
+++ b/eim/build/Makefile
@@ -11,7 +11,7 @@ vfiles = \
 	../rtl/novena_eim.v \
 	../../common/rtl/novena_regs.v \
 	../../common/rtl/novena_clkmgr.v \
-	../../common/rtl/ipcore/clkmgr_dcm.v \
+	../../common/rtl/clkmgr_dcm.v \
 	../../../common/core_selector/src/rtl/core_selector.v \
 	../../../common/core_selector/src/rtl/global_selector.v \
 	../../../common/core_selector/src/rtl/hash_selector.v \
diff --git a/eim/rtl/novena_eim.v b/eim/rtl/novena_eim.v
index 0d8c8d0..2de6cba 100644
--- a/eim/rtl/novena_eim.v
+++ b/eim/rtl/novena_eim.v
@@ -78,15 +78,20 @@ module novena_top
    wire                 sys_rst;
    wire                 eim_bclk_buf;
 
-   novena_clkmgr clkmgr
+   novena_clkmgr #
      (
-      .gclk_p(gclk_p_pin),
-      .gclk_n(gclk_n_pin),
+      .CLK_OUT_MUL      (2),    // 2..32
+      .CLK_OUT_DIV      (2)     // 1..32
+      )
+   clkmgr
+     (
+      .gclk_p           (gclk_p_pin),
+      .gclk_n           (gclk_n_pin),
 
-      .reset_mcu_b(reset_mcu_b_pin),
+      .reset_mcu_b      (reset_mcu_b_pin),
 
-      .sys_clk(sys_clk),
-      .sys_rst(sys_rst)
+      .sys_clk          (sys_clk),
+      .sys_rst          (sys_rst)
       );