diff --git a/Makefile.am b/Makefile.am
index e3ae329..d12885e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,6 +109,7 @@ baseboard_DATA = \
 	baseboards/multi-sim.exp \
 	baseboards/powerpc-sim.exp \
 	baseboards/powerpcle-sim.exp \
+	baseboards/riscv-gvsoc.exp \
 	baseboards/riscv-sim.exp \
 	baseboards/riscv-sim-gdb.exp \
 	baseboards/riscv-sim-nano.exp \
diff --git a/baseboards/riscv-gvsoc.exp b/baseboards/riscv-gvsoc.exp
new file mode 100644
index 0000000..67b59f8
--- /dev/null
+++ b/baseboards/riscv-gvsoc.exp
@@ -0,0 +1,28 @@
+# Load the generic configuration for this board.  This will define any
+# routines needed to communicate with the board.
+load_generic_config "sim"
+
+set_board_info sim "gvsoc_sim"
+set_board_info sim,options ""
+set_board_info is_simulator 1
+
+# No default multilib options are needed for this board.
+process_multilib_options ""
+
+set_board_info cflags    ""
+
+set_board_info ldflags   "$::env(GVSOC_LD_FLAGS)"
+
+# No linker script needed.
+set_board_info ldscript ""
+
+# No support for signals on this target.
+set_board_info gdb,nosignals 1
+set_board_info gcc,stack_size 32768
+
+# L2 memory available without stack, heap and other segments (20kB)
+set_board_info gcc,memory_size 435000
+
+
+# Set timeout
+set_board_info gcc,timeout 10