nexus sim: Bring in more nexus config changes

  - Adjust IRQ numbers for SMC mailbox
  - Tweak memory to the actual FPGA size
  - Add debug tags

Change-Id: I26e1c3c2dfdf8a4350670b34aae811dc64b52e4f
diff --git a/platforms/nexus.repl b/platforms/nexus.repl
index bb1386a..43c4607 100644
--- a/platforms/nexus.repl
+++ b/platforms/nexus.repl
@@ -23,9 +23,9 @@
     wtirq_A -> plic@187    // kTopMatchaPlicIrqIdMailboxSecWtirq
     rtirq_A -> plic@188    // kTopMatchaPlicIrqIdMailboxSecRtirq
     eirq_A  -> plic@189    // kTopMatchaPlicIrqIdMailboxSecEirq
-    wtirq_B -> smc_plic@10 // kTopMatchaPlicIrqIdMailboxSmcWtirq
-    rtirq_B -> smc_plic@11 // kTopMatchaPlicIrqIdMailboxSmcRtirq
-    eirq_B  -> smc_plic@12 // kTopMatchaPlicIrqIdMailboxSmcEirq
+    wtirq_B -> smc_plic@30 // kTopMatchaPlicIrqIdMailboxSmcWtirq
+    rtirq_B -> smc_plic@31 // kTopMatchaPlicIrqIdMailboxSmcRtirq
+    eirq_B  -> smc_plic@32 // kTopMatchaPlicIrqIdMailboxSmcEirq
 
 // ISP               [‘h4200_0000 - ‘h4200_FFFF)  64KB ISP registers
 // DMA Ctrl          [‘h4201_0000 - ‘h4201_FFFF)  64KB DMA control interface
diff --git a/platforms/nexus_smc.repl b/platforms/nexus_smc.repl
index 23ba3c4..3e26cb1 100644
--- a/platforms/nexus_smc.repl
+++ b/platforms/nexus_smc.repl
@@ -6,7 +6,7 @@
 
 // Remember to update hart_is_mc in rom_crt.S if this changes.
 ram_smc: @ sysbus 0x50000000
-    size: 0x380000
+    size: 0x00400000
 
 // SMC Specific Peripherals start at 0x54000000
 
@@ -14,6 +14,9 @@
 smc_control: @ sysbus 0x54020000
     cpu: cpu1
 
+smc_plic:
+    numberOfSources: 43
+
 uart5: @ sysbus 0x54000000
 
 // RV_TIMER_SMC, timer for Cantrip kernel.
@@ -23,4 +26,10 @@
 // Timer for Cantrip software timer service.
 timer_smc_sw: @ sysbus 0x54011000
     frequency: 2500000
+    IRQ -> smc_plic@39
+
+sysbus:
+    init:
+        Tag <0x54010000 0x1000> "OPENTITAN_EARLGREY_DEV_RV_TIMER_SMC"
+        Tag <0x54030000 0x1000> "OPENTITAN_EARLGREY_DEV_RV_TIMER_SMC_SW"