diff --git a/tcl/board/or1k_generic.cfg b/tcl/board/or1k_generic.cfg
index e7588f9e0..5d23641a9 100644
--- a/tcl/board/or1k_generic.cfg
+++ b/tcl/board/or1k_generic.cfg
@@ -4,7 +4,10 @@
 set FPGATAPID 0x020b30dd
 
 # Choose your TAP core (VJTAG , MOHOR or XILINX_BSCAN)
-set TAP_TYPE VJTAG
+if { [info exists TAP_TYPE] == 0} {
+   set TAP_TYPE VJTAG
+}
+
 # Set your chip name
 set CHIPNAME or1200