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

This commit is contained in:
Wolfgang Denk 2009-02-22 21:13:35 +01:00
commit 16bdc39f75
2 changed files with 3 additions and 2 deletions

View File

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

View File

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