diff --git a/target/xilinx/scripts/common.tcl b/target/xilinx/scripts/common.tcl
index d49816b21..f89e090eb 100644
--- a/target/xilinx/scripts/common.tcl
+++ b/target/xilinx/scripts/common.tcl
@@ -8,6 +8,7 @@
 set bpart(genesys2) "digilentinc.com:genesys2:part0:1.1"
 set fpart(genesys2) "xc7k325tffg900-2"
 set hwdev(genesys2) "xc7k325t_0"
+set cfgmp(genesys2) "s25fl256sxxxxxx0-spi-x1_x2_x4"
 
 # vcu128 board params
 set bpart(vcu128) "xilinx.com:vcu128:part0:1.0"
diff --git a/target/xilinx/scripts/util/flash.tcl b/target/xilinx/scripts/util/flash.tcl
index a5d249437..ad0be9d76 100644
--- a/target/xilinx/scripts/util/flash.tcl
+++ b/target/xilinx/scripts/util/flash.tcl
@@ -22,6 +22,7 @@ set hw_cfgmem [get_property PROGRAM.HW_CFGMEM $hw_device]
 # Create image for and configure memory depending on board
 # TODO: add bitstream flashing for genesys2
 switch $board {
+    genesys2 -
     vcu128 {
         set mcs ${project_root}/image.mcs
         write_cfgmem -force -format mcs -size 256 -interface SPIx4 \
diff --git a/target/xilinx/xilinx.mk b/target/xilinx/xilinx.mk
index bbe8102b1..6942a821b 100644
--- a/target/xilinx/xilinx.mk
+++ b/target/xilinx/xilinx.mk
@@ -80,7 +80,7 @@ $(foreach board,$(CHS_XILINX_BOARDS),chs-xilinx-$(1)-$(board)): chs-xilinx-$(1)-
 	[ -e $(subst %,$$*,$(2)) ] || $$(MAKE) $(subst %,$$*,$(2))
 	@rm -f $$(CHS_XILINX_DIR)/build/$$(*)*.$(1).log $$(CHS_XILINX_DIR)/build/$$(*)*.$(1).jou
 	cd $$| && $$(VIVADO) -mode batch -log ../$$(*).$(1).log -jou ../$$(*).$(1).jou -source $$< \
-		-tclargs $$(CHS_XILINX_HWS_URL) $$(or $$(CHS_XILINX_HWS_PATH_$$*),*) $$* $(subst %,$$*,$(2)) 0
+		-tclargs $$(CHS_XILINX_HWS_URL) $$(or $$(CHS_XILINX_HWS_PATH_$$*),{*}) $$* $(subst %,$$*,$(2)) 0
 endef
 
 # Program bitstream onto board