| Message ID | 20170423153525.14882-4-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | b7c7a2602fcbfddb091c461e59fb142ab4bfb765 |
| Delegated to: | Heiko Schocher |
| Headers | show |
Hello Simon, Am 23.04.2017 um 17:35 schrieb Simon Glass: > Drop use of this long-deprecated option. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > board/cm5200/cm5200.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Heiko Schocher <hs@denx.de> Applied to u-boot-i2c/next bye, Heiko > > diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c > index 2f55191caf..0c647bbd3d 100644 > --- a/board/cm5200/cm5200.c > +++ b/board/cm5200/cm5200.c > @@ -214,7 +214,7 @@ static void compose_module_name(hw_id_t hw_id, char *buf) > strcat(buf, tmp); > } > > -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) > +#if defined(CONFIG_SYS_I2C_SOFT) > /* > * Compose string with hostname. > * 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 > int misc_init_r(void) > { > -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) > +#if defined(CONFIG_SYS_I2C_SOFT) > uchar buf[6]; > char str[18]; > char hostname[MODULE_NAME_MAXLEN]; > @@ -323,7 +323,7 @@ int misc_init_r(void) > compose_hostname(hw_id, hostname); > setenv("hostname", hostname); > > -#endif /* defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) */ > +#endif /* defined(CONFIG_SYS_I2C_SOFT) */ > if (!getenv("ethaddr")) > printf(LOG_PREFIX "MAC address not set, networking is not " > "operational\n"); >
diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c index 2f55191caf..0c647bbd3d 100644 --- a/board/cm5200/cm5200.c +++ b/board/cm5200/cm5200.c @@ -214,7 +214,7 @@ static void compose_module_name(hw_id_t hw_id, char *buf) strcat(buf, tmp); } -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) +#if defined(CONFIG_SYS_I2C_SOFT) /* * Compose string with hostname. * 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 int misc_init_r(void) { -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) +#if defined(CONFIG_SYS_I2C_SOFT) uchar buf[6]; char str[18]; char hostname[MODULE_NAME_MAXLEN]; @@ -323,7 +323,7 @@ int misc_init_r(void) compose_hostname(hw_id, hostname); setenv("hostname", hostname); -#endif /* defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) */ +#endif /* defined(CONFIG_SYS_I2C_SOFT) */ if (!getenv("ethaddr")) printf(LOG_PREFIX "MAC address not set, networking is not " "operational\n");
Drop use of this long-deprecated option. Signed-off-by: Simon Glass <sjg@chromium.org> --- board/cm5200/cm5200.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)