Merge pull request #806 from tcal-x/fix_renode_integration

Fixes for Renode changes that had blocked automatic updates
google · Nov 16, 2023 · 094d4e8 · 094d4e8
2 parents 011f00e + 56f7f75
commit 094d4e8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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 <stdint.h>
  #include <string.h>
  #include <stdlib.h>
--#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
@@ -1 +1 @@
-1.13.3+20230418git6bf17cf0
+1.14.0+20231102git998250fe
diff --git 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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		1.13.3+20230418git6bf17cf0
		1.14.0+20231102git998250fe