Merge branch 'main' into script-trycatch

generators/chipyard/src/main/scala/harness/HarnessBinders.scala

@@ -106,7 +106,11 @@ class WithBlockDeviceModel extends OverrideHarnessBinder({
 class WithLoopbackNIC extends OverrideHarnessBinder({
   (system: CanHavePeripheryIceNIC, th: HasHarnessInstantiators, ports: Seq[ClockedIO[NICIOvonly]]) => {
     implicit val p: Parameters = GetSystemParameters(system)
-    ports.map { n => NicLoopback.connect(Some(n.bits), p(NICKey)) }
+    ports.map { n =>
+      withClockAndReset(n.clock, th.harnessBinderReset.asBool) {
+        NicLoopback.connect(Some(n.bits), p(NICKey))
+      }
+    }
   }
 })
 

scripts/insert-includes.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # replaces a `include with the full include file
 #