diff --git a/Makefile b/Makefile
index 10cd5c3..54d17ed 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,8 @@ ifeq ($(BOARD_TARGET), spartan3e)
 else
 ifeq ($(BOARD_TARGET), ml505)
 	UCF=UCF/ML505.ucf
+else
+	UCF=UCF/generic.ucf
 endif
 endif
 
diff --git a/Makefiles/Makefile b/Makefiles/Makefile
index 274a283..f2ce039 100644
--- a/Makefiles/Makefile
+++ b/Makefiles/Makefile
@@ -6,6 +6,10 @@
 include $(MAKEFILES_PATH)/Makefile.boards
 export MAKEFILES_PATH
 
+ifndef FPGA
+	FPGA=$(CONFIG_FPGA_TYPE)
+endif
+
 # impact device number for jtag chain
 ifndef DEVICE_NR
 DEVICE_NR=$(subst ", , $(CONFIG_IMPACT_TARGET))