Merge branch 'fpga' of gitlab.inria.fr:starpu/starpu into fpga

include/starpu_fpga.h

@@ -44,7 +44,8 @@ struct starpu_fpga_data_trans
 /**
    This specifies a Maxeler file to be loaded on some engines.
  */
-struct starpu_max_load {
+struct starpu_max_load
+{
 	max_file_t *file;		/**< Provide the file to be loaded */
 	const char *engine_id_pattern;	/**< Provide the engine(s) on which to be loaded, following
 					     the Maxeler engine naming, i.e. typically

tests/Makefile.am

@@ -1111,7 +1111,7 @@ endif
 
 # Maxeler compiler
 if STARPU_USE_FPGA
-MAX_TARGET = DFE_SIM
+MAX_TARGET ?= DFE_SIM
 MAX_DFE = MAX5C_$(MAX_TARGET)
 
 MAXJ=$(wildcard fpga/*.maxj)