From 921b0c062e25fe6da67c8e03419418cf4ca84a50 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Thu, 5 Oct 2023 11:13:14 -0700 Subject: [PATCH 1/2] Use env python interpreter in insert-includes.py This fixes failing CI for CVA6/nvdla on a system that does not have a /usr/bin/python interpreter by making the script use one from conda env. --- scripts/insert-includes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/insert-includes.py b/scripts/insert-includes.py index 1e8a43ac..ed6fed73 100755 --- a/scripts/insert-includes.py +++ b/scripts/insert-includes.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # replaces a `include with the full include file # From a524adb1b927116550ef83b54360f1f8b6e32182 Mon Sep 17 00:00:00 2001 From: joonho hwangbo Date: Fri, 6 Oct 2023 08:34:15 -0700 Subject: [PATCH 2/2] Fix icenet-loopback clock and reset domain (#1612) * Fix * Bump icenet * revert icenet bump | fix harnessbinders --- .../chipyard/src/main/scala/harness/HarnessBinders.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/generators/chipyard/src/main/scala/harness/HarnessBinders.scala b/generators/chipyard/src/main/scala/harness/HarnessBinders.scala index b670fd74..2b522884 100644 --- a/generators/chipyard/src/main/scala/harness/HarnessBinders.scala +++ b/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)) + } + } } })