Merge branch 'master' of git://git.denx.de/u-boot-blackfin
diff --git a/cpu/blackfin/initcode.c b/cpu/blackfin/initcode.c
index ae0016d..3f3b479 100644
--- a/cpu/blackfin/initcode.c
+++ b/cpu/blackfin/initcode.c
@@ -264,6 +264,7 @@
* 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');
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 27567fa..f6399a9 100644
--- a/include/configs/bf537-stamp.h
+++ b/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