Merge git://git.denx.de/u-boot-fsl-qoriq

- Support of NXP's LX2160RDB and LX2160QDS platform
- Enable SATA DM model for NXP's ARM SoCs

drivers/ddr/fsl/options.c

@@ -22,9 +22,12 @@
  */
 
 /* Board-specific functions defined in each board's ddr.c */
-extern void fsl_ddr_board_options(memctl_options_t *popts,
-		dimm_params_t *pdimm,
-		unsigned int ctrl_num);
+void __weak fsl_ddr_board_options(memctl_options_t *popts,
+				  dimm_params_t *pdimm,
+				  unsigned int ctrl_num)
+{
+	return;
+}
 
 struct dynamic_odt {
 	unsigned int odt_rd_cfg;