From 3d00e44273a83f9867244b5124b4b76ec933c6c5 Mon Sep 17 00:00:00 2001
From: Jean-Michel Gorius <11683623+jmgorius@users.noreply.github.com>
Date: Mon, 2 Mar 2026 14:28:24 +0100
Subject: [PATCH 1/2] Update to latest Spike version

Disable DTB discovery, which was introduced in https://github.com/riscv-software-src/riscv-isa-sim/commit/2c94ea431ed26f9830e576d3493cd431f4119b98
---
 .github/workflows/build-and-test.yml | 2 +-
 pspike/pspike.cc                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 061a32f..3ae57df 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -3,7 +3,7 @@ name: Build and Test
 on: [push, pull_request, workflow_dispatch]
 
 env:
-  SPIKE_COMMIT: f51df5d3955a27602a872eaf01492177513baf6f
+  SPIKE_COMMIT: 591cff16109ced6a21bb2a612a3853b4e9cbd86d
 
 jobs:
   check:
diff --git a/pspike/pspike.cc b/pspike/pspike.cc
index 8150bd2..ac82a86 100644
--- a/pspike/pspike.cc
+++ b/pspike/pspike.cc
@@ -83,6 +83,7 @@ int main(int argc, char** argv) {
   sim_t sim(&cfg, false,
             mems,
             plugin_device_factories,
+            false,
             htif_args,
             dm_config,
             nullptr,

From 519d1b92b0cf23e4baa83f391de74196387efdd5 Mon Sep 17 00:00:00 2001
From: Jean-Michel Gorius <11683623+jmgorius@users.noreply.github.com>
Date: Tue, 31 Mar 2026 14:52:04 +0200
Subject: [PATCH 2/2] Pull the latest version of Spike

---
 .github/workflows/build-and-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 3ae57df..09d3942 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -3,7 +3,7 @@ name: Build and Test
 on: [push, pull_request, workflow_dispatch]
 
 env:
-  SPIKE_COMMIT: 591cff16109ced6a21bb2a612a3853b4e9cbd86d
+  SPIKE_COMMIT: 509bec19b01aa2f0445045cad6c540698714efad
 
 jobs:
   check: