diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 6655152960..35e4a75c3f 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -299,6 +299,14 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 				"-@1536k(UBI)\0"
 #endif
 
+/* UBI and UBIFS support */
+#if defined(CONFIG_CMD_SF) || defined(CONFIG_CMD_NAND)
+#define CONFIG_CMD_UBI
+#define CONFIG_CMD_UBIFS
+#define CONFIG_RBTREE
+#define CONFIG_LZO
+#endif
+
 /*
  * SPL
  *