LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2c: cm5200: Drop use of CONFIG_I2C_HARD 

Drop use of this long-deprecated option.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2017-05-12 21:09:51 -06:00 committed by Heiko Schocher
parent 7ffce4f17f
commit b7c7a2602f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
board/cm5200/cm5200.c
View File

@ -214,7 +214,7 @@ static void compose_module_name(hw_id_t hw_id, char *buf)
strcat(buf, tmp); strcat(buf, tmp);
} }
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) #if defined(CONFIG_SYS_I2C_SOFT)
/* /*
* Compose string with hostname. * Compose string with hostname.
* buf is assumed to have enough space, and be null-terminated. * buf is assumed to have enough space, and be null-terminated.
@ -295,7 +295,7 @@ int board_early_init_r(void)
#ifdef CONFIG_MISC_INIT_R #ifdef CONFIG_MISC_INIT_R
int misc_init_r(void) int misc_init_r(void)
{ {
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) #if defined(CONFIG_SYS_I2C_SOFT)
uchar buf[6]; uchar buf[6];
char str[18]; char str[18];
char hostname[MODULE_NAME_MAXLEN]; char hostname[MODULE_NAME_MAXLEN];
@ -323,7 +323,7 @@ int misc_init_r(void)
compose_hostname(hw_id, hostname); compose_hostname(hw_id, hostname);
setenv("hostname", hostname); setenv("hostname", hostname);
#endif /* defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) */ #endif /* defined(CONFIG_SYS_I2C_SOFT) */
if (!getenv("ethaddr")) if (!getenv("ethaddr"))
printf(LOG_PREFIX "MAC address not set, networking is not " printf(LOG_PREFIX "MAC address not set, networking is not "
"operational\n"); "operational\n");