Merge branch 'master' of git://git.denx.de/u-boot-blackfin

cpu/blackfin/initcode.c

@@ -264,6 +264,7 @@ void initcode(ADI_BOOT_DATA *bootstruct)
 	 * the memory controller.  Older bootroms lacks such helpers
 	 * so we do it ourselves.
 	 */
+#define BOOTROM_CAPS_SYSCONTROL 0
 	if (BOOTROM_CAPS_SYSCONTROL) {
 		serial_putc('S');
 

include/configs/bf537-stamp.h

@@ -308,8 +308,8 @@
  */
 #define CONFIG_HARD_I2C		1
 #define CONFIG_BFIN_TWI_I2C	1
-#define CFG_I2C_SPEED		50000
-#define CFG_I2C_SLAVE		0
+#define CONFIG_SYS_I2C_SPEED	50000
+#define CONFIG_SYS_I2C_SLAVE	0
 
 #define CONFIG_EBIU_SDRRC_VAL  0x306
 #define CONFIG_EBIU_SDGCTL_VAL 0x91114d