Skip to content

Fixes for Renode changes that had blocked automatic updates #806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mithro merged 1 commit into from
Nov 16, 2023
Merged

Fixes for Renode changes that had blocked automatic updates #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions common/renode-verilator-integration/renode_h.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conf/renode.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.13.3+20230418git6bf17cf0
1.14.0+20231102git998250fe
1 change: 1 addition & 0 deletions scripts/setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down