[darjeeling,rtl] Enable flop between ROM and KMAC in Darjeeling

rswarbrick · rswarbrick · commit 86d892cf2593 · 2025-07-18T15:05:08.000+01:00
Signed-off-by: Rupert Swarbrick &lt;rswarbrick@lowrisc.org&gt;
diff --git a/hw/top_darjeeling/data/autogen/top_darjeeling.gen.hjson b/hw/top_darjeeling/data/autogen/top_darjeeling.gen.hjson
@@ -7769,6 +7769,7 @@
       param_decl:
       {
         SecDisableScrambling: 1'b0
+        FlopToKmac: 1'b1
       }
       clock_connections:
       {
@@ -7793,7 +7794,7 @@
             sent to KMAC. This may break long paths.
             '''
           type: bit
-          default: 1'b0
+          default: 1'b1
           local: "false"
           expose: "true"
           name_top: RomCtrl0FlopToKmac
@@ -7968,6 +7969,7 @@
       param_decl:
       {
         SecDisableScrambling: 1'b0
+        FlopToKmac: 1'b1
       }
       clock_connections:
       {
@@ -7992,7 +7994,7 @@
             sent to KMAC. This may break long paths.
             '''
           type: bit
-          default: 1'b0
+          default: 1'b1
           local: "false"
           expose: "true"
           name_top: RomCtrl1FlopToKmac
diff --git a/hw/top_darjeeling/data/top_darjeeling.hjson b/hw/top_darjeeling/data/top_darjeeling.hjson
@@ -887,7 +887,8 @@
         }
       },
       param_decl: {
-        SecDisableScrambling: "1'b0"
+        SecDisableScrambling: "1'b0",
+        FlopToKmac: "1'b1"
       }
     },
     { name: "rom_ctrl1",
@@ -913,7 +914,8 @@
         }
       },
       param_decl: {
-        SecDisableScrambling: "1'b0"
+        SecDisableScrambling: "1'b0",
+        FlopToKmac: "1'b1"
       }
     },
     { name: "dma",
diff --git a/hw/top_darjeeling/rtl/autogen/top_darjeeling.sv b/hw/top_darjeeling/rtl/autogen/top_darjeeling.sv
@@ -108,11 +108,11 @@ module top_darjeeling #(
   parameter bit SramCtrlMboxEccCorrection = 0,
   // parameters for rom_ctrl0
   parameter RomCtrl0BootRomInitFile = "",
-  parameter bit RomCtrl0FlopToKmac = 1'b0,
+  parameter bit RomCtrl0FlopToKmac = 1'b1,
   parameter bit SecRomCtrl0DisableScrambling = 1'b0,
   // parameters for rom_ctrl1
   parameter RomCtrl1BootRomInitFile = "",
-  parameter bit RomCtrl1FlopToKmac = 1'b0,
+  parameter bit RomCtrl1FlopToKmac = 1'b1,
   parameter bit SecRomCtrl1DisableScrambling = 1'b0,
   // parameters for dma
   parameter bit DmaEnableDataIntgGen = 1'b1,

Original file line number	Diff line number	Diff line change
`@@ -7769,6 +7769,7 @@`
`7769`	`7769`	`param_decl:`
`7770`	`7770`	`{`
`7771`	`7771`	`SecDisableScrambling: 1'b0`
	`7772`	`+ FlopToKmac: 1'b1`
`7772`	`7773`	`}`
`7773`	`7774`	`clock_connections:`
`7774`	`7775`	`{`
`@@ -7793,7 +7794,7 @@`
`7793`	`7794`	`sent to KMAC. This may break long paths.`
`7794`	`7795`	`'''`
`7795`	`7796`	`type: bit`
`7796`		`- default: 1'b0`
	`7797`	`+ default: 1'b1`
`7797`	`7798`	`local: "false"`
`7798`	`7799`	`expose: "true"`
`7799`	`7800`	`name_top: RomCtrl0FlopToKmac`
`@@ -7968,6 +7969,7 @@`
`7968`	`7969`	`param_decl:`
`7969`	`7970`	`{`
`7970`	`7971`	`SecDisableScrambling: 1'b0`
	`7972`	`+ FlopToKmac: 1'b1`
`7971`	`7973`	`}`
`7972`	`7974`	`clock_connections:`
`7973`	`7975`	`{`
`@@ -7992,7 +7994,7 @@`
`7992`	`7994`	`sent to KMAC. This may break long paths.`
`7993`	`7995`	`'''`
`7994`	`7996`	`type: bit`
`7995`		`- default: 1'b0`
	`7997`	`+ default: 1'b1`
`7996`	`7998`	`local: "false"`
`7997`	`7999`	`expose: "true"`
`7998`	`8000`	`name_top: RomCtrl1FlopToKmac`
Original file line number	Diff line number	Diff line change
`@@ -887,7 +887,8 @@`
`887`	`887`	`}`
`888`	`888`	`},`
`889`	`889`	`param_decl: {`
`890`		`- SecDisableScrambling: "1'b0"`
	`890`	`+ SecDisableScrambling: "1'b0",`
	`891`	`+ FlopToKmac: "1'b1"`
`891`	`892`	`}`
`892`	`893`	`},`
`893`	`894`	`{ name: "rom_ctrl1",`
`@@ -913,7 +914,8 @@`
`913`	`914`	`}`
`914`	`915`	`},`
`915`	`916`	`param_decl: {`
`916`		`- SecDisableScrambling: "1'b0"`
	`917`	`+ SecDisableScrambling: "1'b0",`
	`918`	`+ FlopToKmac: "1'b1"`
`917`	`919`	`}`
`918`	`920`	`},`
`919`	`921`	`{ name: "dma",`