From patchwork Thu Aug 3 18:21:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 797396 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="gXp/TeAr"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xNdth3c93z9s81 for ; Fri, 4 Aug 2017 04:31:40 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 2BFB6C21EC4; Thu, 3 Aug 2017 18:27:46 +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 40D10C21E28; Thu, 3 Aug 2017 18:23:11 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 258FDC21E18; Thu, 3 Aug 2017 18:22:51 +0000 (UTC) Received: from mail-oi0-f44.google.com (mail-oi0-f44.google.com [209.85.218.44]) by lists.denx.de (Postfix) with ESMTPS id B5023C21C51 for ; Thu, 3 Aug 2017 18:22:47 +0000 (UTC) Received: by mail-oi0-f44.google.com with SMTP id e124so20475010oig.2 for ; Thu, 03 Aug 2017 11:22:47 -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=3oe+nU1zi1h/3JvL1Dbt4DTzj1hHwlB92rHLc/OrfOg=; b=gXp/TeArtiE+UDHHtJbpB0MA8KerQM7trhJxy7yxdcaCtH01tkBJtdlgdxLgvyDbMG KLxxnVivz58NoeXmGp/lhjWjWuafkUoqxLQzkEOf6YtXJsZMCi66+4T2/CkTlYwSpJjR cI9g6VkGxRTcpa3mO4KQ03VUyxlv0rvLTWZnacHplhz1DXtzWLe3sYVLca/DfXT/7Z5Y oblS8CNjNALnO6tw8DogAQAKv1Y2QrWAyAI5xA3Eb9fOrtbXRmWtWwrpE49+O4F0YjWQ dNYPkohVU+BOMqQmEZce30/WbsP+dmo7qmS6oFE53EsgVqHd77+LkO28n8TTAqsI76T9 ibLw== 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=3oe+nU1zi1h/3JvL1Dbt4DTzj1hHwlB92rHLc/OrfOg=; b=GmFGK07cnZidKBpacg2TO2rDQ1V6/9xm3ATxA38FzDPZi5b15d7joYnPI5FRKaeW3Y ze8oKquc/C7wzZNf6YiXaqfpBviCqokjtrubiimtyE6b7JT+o4Mh6FphB8WGRehj512w q8qQ/z/mtgHv7LMBuyYzgg8N5Lm3KyAdsTDb58nuMC9Nqq8znq9DbkicooPbChrDpzLe Dxa99nVPxBM8oe2uGYYd10cpcUBN/xEsoVivlPKtsst6ntS7GI4MgenekTxraKiJ9czC /d8Rfm6vIlIjlEF/Z4Eo/BOGu0IaoVGC0gnokjKozdCvoFw/fdMfyNWRRW6yyYY5xDz4 HAzg== X-Gm-Message-State: AHYfb5i2naiIgl/S6yixCu7PIlo0+J7W801hFSNCJi+UtCWxmZYlGLXQ VAZXvBnn+TKfmPSb X-Received: by 10.202.57.5 with SMTP id g5mr2202354oia.183.1501784566385; Thu, 03 Aug 2017 11:22:46 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:0:10f2:0:4999:4b63:9ee7:6e58]) by smtp.gmail.com with ESMTPSA id p185sm31445944oia.14.2017.08.03.11.22.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Aug 2017 11:22:45 -0700 (PDT) Received: by kiwi.bld.corp.google.com (Postfix, from userid 121222) id 0E6CA1413F5; Thu, 3 Aug 2017 12:22:45 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Thu, 3 Aug 2017 12:21:57 -0600 Message-Id: <20170803182217.149285-11-sjg@chromium.org> X-Mailer: git-send-email 2.14.0.rc1.383.gd1ce394fe2-goog In-Reply-To: <20170803182217.149285-1-sjg@chromium.org> References: <20170803182217.149285-1-sjg@chromium.org> Cc: Tom Rini , Joe Hershberger , Andreas Fenkart Subject: [U-Boot] [PATCH v5 10/30] env: Rename nand env_location to nand_env_location 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" We want to use this name for all environment drivers. Update the nand driver to use a more specific name. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None env/nand.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/env/nand.c b/env/nand.c index 90f274bf8a..d1b8b26999 100644 --- a/env/nand.c +++ b/env/nand.c @@ -158,12 +158,12 @@ static int writeenv(size_t offset, u_char *buf) return 0; } -struct env_location { +struct nand_env_location { const char *name; const nand_erase_options_t erase_opts; }; -static int erase_and_write_env(const struct env_location *location, +static int erase_and_write_env(const struct nand_env_location *location, u_char *env_new) { struct mtd_info *mtd; @@ -189,7 +189,7 @@ int saveenv(void) int ret = 0; ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1); int env_idx = 0; - static const struct env_location location[] = { + static const struct nand_env_location location[] = { { .name = "NAND", .erase_opts = {