Initial system-level wiring

system/nanosoc_subsystems/systemctrl/verilog/nanosoc_ss_systemctrl.v

@@ -21,6 +21,7 @@ module nanosoc_ss_systemctrl #(
     parameter    CLKGATE_PRESENT = 0
 )(
     // Free-running and Crystal Clock Output
+    input  wire                   SYS_CLK,              // System Input Clock
     output wire                   SYS_FCLK,             // Free-running system clock
     output wire                   SYS_XTALCLK_OUT,      // Crystal Clock Output
     
@@ -96,7 +97,7 @@ module nanosoc_ss_systemctrl #(
     // CPU power/reset control
     output wire                   SYS_REMAP_CTRL,       // REMAP control bit
     output wire                   SYS_WDOGRESETREQ,     // Watchdog reset request
-    output wire                   CPU_0_LOCKUPRESET,    // System Controller cfg - reset if lockup
+    output wire                   SYS_LOCKUPRESET,      // System Controller cfg - reset if lockup
     
     // System Reset Request Signals
     output wire                   SYS_SYSRESETREQ,       // System Request from System Managers
@@ -152,7 +153,7 @@ module nanosoc_ss_systemctrl #(
         .SLEEPING         (CPU_0_SLEEPING),
         .SLEEPDEEP        (CPU_0_SLEEPDEEP),
         .LOCKUP           (CPU_0_LOCKUP),
-        .LOCKUPRESET      (CPU_0_LOCKUPRESET),
+        .LOCKUPRESET      (SYS_LOCKUPRESET),
         .SYSRESETREQ      (SYS_PRMURESETREQ),
         .DBGRESETREQ      (SYS_PMUDBGRESETREQ),
         .CGBYPASS         (SYS_TESTMODE),
@@ -271,7 +272,7 @@ module nanosoc_ss_systemctrl #(
         .exp12_prdata(DMAC_1_PRDATA),
         .exp12_pready(DMAC_1_PREADY),
         .exp12_pslverr(DMAC_1_PSLVERR),
-        .exp13_prdata({APB_ADDR_W{1'b0}}),
+        .exp13_prdata({APB_DATA_W{1'b0}}),
         .exp13_pready(1'b1),
         .exp13_pslverr(1'b1),
         .exp14_prdata(USRT_PRDATA),
@@ -293,7 +294,7 @@ module nanosoc_ss_systemctrl #(
         .SYSRESETREQ(SYS_SYSRESETREQ),
         .WDOGRESETREQ(SYS_WDOGRESETREQ),
         .LOCKUP(CPU_0_LOCKUP),
-        .LOCKUPRESET(CPU_0_LOCKUPRESET),
+        .LOCKUPRESET(SYS_LOCKUPRESET),
         .PMUENABLE(SYS_PMUENABLE),
 
         // IO signaling