From patchwork Sun Apr 23 15:35:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 753931 X-Patchwork-Delegate: hs@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3w9tpw3ZNzz9s03 for ; Mon, 24 Apr 2017 01:35:51 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="afrImpjQ"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 9B46DC21C67; Sun, 23 Apr 2017 15:35:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E5299C21C2B; Sun, 23 Apr 2017 15:35:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7D95DC21BE6; Sun, 23 Apr 2017 15:35:37 +0000 (UTC) Received: from mail-io0-f175.google.com (mail-io0-f175.google.com [209.85.223.175]) by lists.denx.de (Postfix) with ESMTPS id F0001C21C29 for ; Sun, 23 Apr 2017 15:35:36 +0000 (UTC) Received: by mail-io0-f175.google.com with SMTP id a103so158728380ioj.1 for ; Sun, 23 Apr 2017 08:35:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=f2LNNr62BMHlxtjuOZdN++56wzcuBw7KAnfUt6Ec6nA=; b=afrImpjQvgJmxyBySz1foEieLenHI1bC/8LbkuleZ5oQlXO7LSq8PhUnIsp5KE64UJ i6WDmRaY+QOUBhLKzYdlhd7oByrSg2EpZqSziinjiuQ+sPDHPn88h25a54uPilpNGt5g LE2ZiGBUZQa0Aq+KQ/d90NIgcQcHNs2nQN1zkYwwbw/KTW3wgL6QeohFgkQR86O47yLm M8RCh6sS5U2rQHe8eafv/dMoHvj6mevmTNuj1ne8y10FL/1oacgKB3Of00u87q4ikfoX pL92n9UymV99Iipcn5qlhrxGS98b90jlJ4Qfzh0+1yKvLQGFSS74RkSeieSxgPVtlBNd VbFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=f2LNNr62BMHlxtjuOZdN++56wzcuBw7KAnfUt6Ec6nA=; b=aN2BqdKV5jp7NWGo9igNQZBBELhaWZ64c2b08DUAxIcYRrtqvr5ogZFyOfMp6uxI2o yd8Vuul2nYMZG2rDxGeKNs9TXBV/Q7KpGclzJAoHfv7Gz1zHVBSPEHYTsLo78p9nLFmv 7bhed/L2ozOGrIHTIuXlGjnF/ZWEZAiAI/7ukFvNWpifcRzcRflyx1cNO6HYeQOh2me6 zSyAYP/As62qdV2jnoMPadzIviBaVYylfI0rqTfioxXJjtewkHJluEzqI5WVScOwWK6A zL8QP4gcPx1bXKIlhxiv7w/UKvNlaQLq0AxHHb7YWr9YSTAGOa699/1kze0zLXhFlGGQ J7jQ== X-Gm-Message-State: AN3rC/7cEq3ljf2bgNrq8MWuHD1CWYu7MRsZs6je9tk2QAlDvpPKilRT 4+mRt4/57yqdDtSrEkyd6g== X-Received: by 10.202.198.6 with SMTP id w6mr5387553oif.58.1492961735763; Sun, 23 Apr 2017 08:35:35 -0700 (PDT) Received: from kaki.bld.corp.google.com ([100.100.184.96]) by smtp.gmail.com with ESMTPSA id b14sm1839009oih.40.2017.04.23.08.35.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 08:35:35 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 449B440081; Sun, 23 Apr 2017 09:35:34 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 23 Apr 2017 09:35:17 -0600 Message-Id: <20170423153525.14882-4-sjg@chromium.org> X-Mailer: git-send-email 2.12.2.816.g2cccc81164-goog In-Reply-To: <20170423153525.14882-1-sjg@chromium.org> References: <20170423153525.14882-1-sjg@chromium.org> Cc: Stefan Roese , Tom Rini Subject: [U-Boot] [PATCH 03/11] i2c: cm5200: Drop use of CONFIG_I2C_HARD X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Drop use of this long-deprecated option. Signed-off-by: Simon Glass Reviewed-by: Heiko Schocher --- 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");