Increase remotetimeout for spike targets.

On overloaded systems, when executing compare-sections, otherwise gdb
might hit a timeout and the compare-sections code doesn't deal with it.
(You get an error message complaining that 130 is not a valid hex
digit.)

diff --git a/debug/targets/RISC-V/spike32-2.py b/debug/targets/RISC-V/spike32-2.py
index 09bab1d05017289233d626f0d4cc341dde2d8256..6cf558d4b936c6634100ecde00d289990b50129c 100644 (file)
--- a/debug/targets/RISC-V/spike32-2.py
+++ b/debug/targets/RISC-V/spike32-2.py
@@ -6,6 +6,7 @@ import spike32  # pylint: disable=import-error
 class spike32_2(targets.Target):
     harts = [spike32.spike32_hart(), spike32.spike32_hart()]
     openocd_config_path = "spike.cfg"
+    timeout_sec = 30
 
     def create(self):
         return testlib.Spike(self)

diff --git a/debug/targets/RISC-V/spike32.py b/debug/targets/RISC-V/spike32.py
index e80f60a07a51e6ae38ee0b2afad51f201e1f0146..fc7d598c9ff4fc3c88883a84eb01b8a7e9bffd35 100644 (file)
--- a/debug/targets/RISC-V/spike32.py
+++ b/debug/targets/RISC-V/spike32.py
@@ -12,6 +12,7 @@ class spike32_hart(targets.Hart):
 class spike32(targets.Target):
     harts = [spike32_hart()]
     openocd_config_path = "spike.cfg"
+    timeout_sec = 30
 
     def create(self):
         return testlib.Spike(self)

diff --git a/debug/targets/RISC-V/spike64-2.py b/debug/targets/RISC-V/spike64-2.py
index f2e0a8a7af89cc190b432f6a94b3b3400711fbfe..c6321dcebb2e4e5be1baa9dcffd92d21f09d74ac 100644 (file)
--- a/debug/targets/RISC-V/spike64-2.py
+++ b/debug/targets/RISC-V/spike64-2.py
@@ -6,6 +6,7 @@ import spike64  # pylint: disable=import-error
 class spike64_2(targets.Target):
     harts = [spike64.spike64_hart(), spike64.spike64_hart()]
     openocd_config_path = "spike.cfg"
+    timeout_sec = 30
 
     def create(self):
         return testlib.Spike(self)

diff --git a/debug/targets/RISC-V/spike64-2gdb.py b/debug/targets/RISC-V/spike64-2gdb.py
new file mode 100644 (file)
index 0000000..200ffaa
--- /dev/null
+++ b/debug/targets/RISC-V/spike64-2gdb.py
@@ -0,0 +1,11 @@
+import targets
+import testlib
+
+import spike64
+
+class spike64_2gdb(targets.Target):
+    harts = [spike64.spike64_hart(), spike64.spike64_hart()]
+    openocd_config_path = "spike-2gdb.cfg"
+
+    def create(self):
+        return testlib.Spike(self)

diff --git a/debug/targets/RISC-V/spike64.py b/debug/targets/RISC-V/spike64.py
index 84586e33f46d682d18ab63db92ec4b5c83562da5..6e3da896ef01b79a454893fe964def2da1c441ab 100644 (file)
--- a/debug/targets/RISC-V/spike64.py
+++ b/debug/targets/RISC-V/spike64.py
@@ -12,6 +12,7 @@ class spike64_hart(targets.Hart):
 class spike64(targets.Target):
     harts = [spike64_hart()]
     openocd_config_path = "spike.cfg"
+    timeout_sec = 30
 
     def create(self):
         return testlib.Spike(self)