diff options
| author | Andy Fleming <afleming@freescale.com> | 2008-02-13 18:36:27 -0600 |
|---|---|---|
| committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2008-02-13 18:36:27 -0600 |
| commit | d1bcf9e53b41dfa4be6943b739ee82627a0a6d31 (patch) | |
| tree | 981e6e8d1b9f40e566d97340fcd0c20740cabe78 /lib_arm/board.c | |
| parent | ed2cf548cac80cd3cf8154dcfe7b2685bef45938 (diff) | |
| parent | 10bbb38a402a2faf18858c451bcdc63d45888e6e (diff) | |
| download | u-boot-imx-d1bcf9e53b41dfa4be6943b739ee82627a0a6d31.zip u-boot-imx-d1bcf9e53b41dfa4be6943b739ee82627a0a6d31.tar.gz u-boot-imx-d1bcf9e53b41dfa4be6943b739ee82627a0a6d31.tar.bz2 | |
Merge branch 'denx'
Diffstat (limited to 'lib_arm/board.c')
| -rw-r--r-- | lib_arm/board.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/lib_arm/board.c b/lib_arm/board.c index 7e7a282..22d573a 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -84,6 +84,11 @@ extern void cs8900_get_enetaddr (uchar * addr); extern void rtl8019_get_enetaddr (uchar * addr); #endif +#if defined(CONFIG_HARD_I2C) || \ + defined(CONFIG_SOFT_I2C) +#include <i2c.h> +#endif + /* * Begin and End of memory area for malloc(), and current "brk" */ @@ -209,6 +214,16 @@ static void display_flash_config (ulong size) } #endif /* CFG_NO_FLASH */ +#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C) +static int init_func_i2c (void) +{ + puts ("I2C: "); + i2c_init (CFG_I2C_SPEED, CFG_I2C_SLAVE); + puts ("ready\n"); + return (0); +} +#endif + /* * Breathe some life into the board... * @@ -251,6 +266,9 @@ init_fnc_t *init_sequence[] = { #if defined(CONFIG_DISPLAY_BOARDINFO) checkboard, /* display board info */ #endif +#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C) + init_func_i2c, +#endif dram_init, /* configure available RAM banks */ display_dram_config, NULL, |