aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-05-12 21:09:51 -0600
committerHeiko Schocher <hs@denx.de>2017-05-15 06:17:38 +0200
commitb7c7a2602fcbfddb091c461e59fb142ab4bfb765 (patch)
tree117e0dac68604202371897d2af299ca7405d7505
parent7ffce4f17fdbb110f572dae60670ec28db731ef2 (diff)
downloadu-boot-b7c7a2602fcbfddb091c461e59fb142ab4bfb765.zip
u-boot-b7c7a2602fcbfddb091c461e59fb142ab4bfb765.tar.gz
u-boot-b7c7a2602fcbfddb091c461e59fb142ab4bfb765.tar.bz2
i2c: cm5200: Drop use of CONFIG_I2C_HARD
Drop use of this long-deprecated option. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--board/cm5200/cm5200.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c
index 2f55191..0c647bb 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");