Merge remote-tracking branch 'origin/eb_dev' into mp_eb_dev

# Conflicts:
#	tb/shinTest/ShinTopSpiTb.v
#	tb/shinTest/testcase_result/base_tc06_result.log

src/main/scala/backBoard/shin/Interface.scala

@@ -42,6 +42,8 @@ class CommonRegisterBundle extends Bundle{
 
   val spiSel    = UInt(2.W)
 
+  val uniCode = UInt(64.W)
+
   val softResetCode = Vec(4, UInt(8.W))
 
   val intEnable = UInt(32.W)
@@ -195,6 +197,9 @@ class InterfaceIO extends Bundle{
 
   val latchPin = Input(Vec(2, Bool()))
   val isPoReset = Output(Bool())
+
+  val hwSerial  = Input(UInt(48.W))
+  val uniCode   = Input(UInt(64.W))
 }
 
 
@@ -232,7 +237,11 @@ abstract class InterfaceBase extends Module{
       ((0 until 6).map{ i =>
         (addr === ("h2".U(16.W) + i.U) ) -> cReg.hwSerial( 8*i+7,8*i+0 )
       }) ++
-      
+
+      ((0 until 8).map{ i =>
+        (addr === ("h10".U(16.W) + i.U) ) -> cReg.uniCode( 8*i+7,8*i+0 )
+      }) ++
+
       Seq(
         (addr === "h8".U )  -> cReg.busRate( 7,0 ),
         (addr === "h9".U )  -> cReg.spiSel,
@@ -588,14 +597,7 @@ trait InterfaceMCUop{ this: InterfaceBase =>
 
 
   cReg.mstOrSlv  := RegEnable( dataw(1,0), 0.U, isEnW & addrw === "h0".U & cReg.mstOrSlv === 0.U )
-  cReg.hwVersion := RegEnable( dataw     , "hF0".U, isEnW & addrw === "h1".U & cReg.mstOrSlv === 0.U )
 
-  cReg.hwSerial := 
-    Cat(
-      (0 until 6).map{ i =>
-      RegEnable( dataw, "haa".U, isEnW & addrw === ("h2".U(16.W) + i.U) & cReg.mstOrSlv === 0.U )
-      }.reverse
-    )
   
   cReg.busRate := RegEnable( dataw, "h55".U, isEnW & addrw === "h8".U & cReg.mstOrSlv === 0.U )
   cReg.spiSel  := RegEnable( dataw(1,0), 0.U, isEnW & addrw === "h9".U & cReg.mstOrSlv === 0.U )
@@ -1382,6 +1384,9 @@ with InterfaceWdt
 with InterfaceSystem
 with InterfaceEvent
 {
+  cReg.hwVersion := "h1".U
+  cReg.hwSerial := io.hwSerial
+  cReg.uniCode := io.uniCode
 
 
   io.txReq.bits.txSM  := mReg.txSM