diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-02-22 21:13:35 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-02-22 21:13:35 +0100 |
| commit | 16bdc39f7555e23c76f1dcd3da96e7bbce839241 (patch) | |
| tree | 1ef02eb2debea7053230b2f004f84dd745c7c692 | |
| parent | 09fee8e8677a6265e89144ccc163bf00e321769e (diff) | |
| parent | e1ffaee728190e76a4596a3579d94e730143585f (diff) | |
| download | u-boot-imx-16bdc39f7555e23c76f1dcd3da96e7bbce839241.zip u-boot-imx-16bdc39f7555e23c76f1dcd3da96e7bbce839241.tar.gz u-boot-imx-16bdc39f7555e23c76f1dcd3da96e7bbce839241.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
| -rw-r--r-- | cpu/blackfin/initcode.c | 1 | ||||
| -rw-r--r-- | include/configs/bf537-stamp.h | 4 |
2 files changed, 3 insertions, 2 deletions
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 @@ 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'); 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 |