From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Glass Date: Thu, 11 May 2017 18:23:52 -0600 Subject: [U-Boot] [PATCH v2 03/12] i2c: cm5200: Drop use of CONFIG_I2C_HARD In-Reply-To: <20170512002401.13115-1-sjg@chromium.org> References: <20170512002401.13115-1-sjg@chromium.org> Message-ID: <20170512002401.13115-4-sjg@chromium.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Drop use of this long-deprecated option. Signed-off-by: Simon Glass --- Changes in v2: None board/cm5200/cm5200.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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"); -- 2.13.0.rc2.291.g57267f2277-goog