From 1b228d68f54832edd867ef98520f760f68192ab7 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 19 Feb 2009 01:19:49 -0500 Subject: [PATCH 1/2] Blackfin: bf537-stamp: fix I2C board defines The previous merge for cleaning up the I2C driver incorrectly reverted the CFG_xxx rename for some of the I2C defines. Signed-off-by: Mike Frysinger Signed-off-by: Heiko Schocher --- include/configs/bf537-stamp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index 27567faab2..f6399a9f52 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 From e1ffaee728190e76a4596a3579d94e730143585f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 19 Feb 2009 01:20:27 -0500 Subject: [PATCH 2/2] Blackfin: disable syscontrol code for now Looks like the initcode updates fell out of order during my merges. The patch that really fixes up this code is part of power-on overhaul and so is too large for merging at this point. Instead, we can disable the code as no currently in-tree board depends on it. The next merge window will fix things up properly. Signed-off-by: Mike Frysinger --- cpu/blackfin/initcode.c | 1 + 1 file changed, 1 insertion(+) diff --git a/cpu/blackfin/initcode.c b/cpu/blackfin/initcode.c index ae0016de18..3f3b4796c1 100644 --- a/cpu/blackfin/initcode.c +++ b/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');