From 56f7f7558ca1477266c67de65021b65b18f77372 Mon Sep 17 00:00:00 2001 From: Tim Callahan Date: Sat, 4 Nov 2023 23:05:35 -0700 Subject: [PATCH] Fixes for breaking Renode changes that had blocked updates (PR #794) for many months. Required updating the patch for renode.h, and also downloading an additional file. Signed-off-by: Tim Callahan --- common/renode-verilator-integration/renode_h.patch | 5 ++--- conf/renode.version | 2 +- scripts/setup | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/renode-verilator-integration/renode_h.patch b/common/renode-verilator-integration/renode_h.patch index 81899998a..53e65f255 100644 --- a/common/renode-verilator-integration/renode_h.patch +++ b/common/renode-verilator-integration/renode_h.patch @@ -2,11 +2,10 @@ Since `renode.h` comes from VerilatorPlugin then its include path is relative to This patch ensures that `renode_imports.h` will be looked for in a correct place. --- a/src/renode.h +++ b/src/renode.h -@@ -8,7 +8,7 @@ - #define RENODE_H +@@ -9,6 +9,7 @@ + #include #include #include --#include "../../../../Infrastructure/src/Emulator/Cores/renode/include/renode_imports.h" +#include "../renode_imports.h" // Protocol must be in sync with Renode's ProtocolMessage diff --git a/conf/renode.version b/conf/renode.version index 36aa8c0b5..52af52736 100644 --- a/conf/renode.version +++ b/conf/renode.version @@ -1 +1 @@ -1.13.3+20230418git6bf17cf0 +1.14.0+20231102git998250fe diff --git a/scripts/setup b/scripts/setup index de9e42e21..297fc88e2 100755 --- a/scripts/setup +++ b/scripts/setup @@ -129,6 +129,7 @@ if [ ! -e "${VIL_DIR}" ]; then wget -O ${VIL_DIR}/src/renode_cfu.cpp https://raw.githubusercontent.com/renode/renode/${RENODE_VERSION_SHA}/src/Plugins/VerilatorPlugin/VerilatorIntegrationLibrary/src/renode_cfu.cpp wget -O ${VIL_DIR}/src/renode_cfu.h https://raw.githubusercontent.com/renode/renode/${RENODE_VERSION_SHA}/src/Plugins/VerilatorPlugin/VerilatorIntegrationLibrary/src/renode_cfu.h wget -O ${VIL_DIR}/src/renode.h https://raw.githubusercontent.com/renode/renode/${RENODE_VERSION_SHA}/src/Plugins/VerilatorPlugin/VerilatorIntegrationLibrary/src/renode.h + wget -O ${VIL_DIR}/src/renode_action_enumerators.txt https://raw.githubusercontent.com/renode/renode/${RENODE_VERSION_SHA}/src/Plugins/VerilatorPlugin/VerilatorIntegrationLibrary/src/renode_action_enumerators.txt wget -O ${VIL_DIR}/src/buses/cfu.cpp https://raw.githubusercontent.com/renode/renode/${RENODE_VERSION_SHA}/src/Plugins/VerilatorPlugin/VerilatorIntegrationLibrary/src/buses/cfu.cpp wget -O ${VIL_DIR}/src/buses/cfu.h https://raw.githubusercontent.com/renode/renode/${RENODE_VERSION_SHA}/src/Plugins/VerilatorPlugin/VerilatorIntegrationLibrary/src/buses/cfu.h wget -O ${VIL_DIR}/src/buses/bus.h https://raw.githubusercontent.com/renode/renode/${RENODE_VERSION_SHA}/src/Plugins/VerilatorPlugin/VerilatorIntegrationLibrary/src/buses/bus.h