From patchwork Sun Jul 9 20:53:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 786025 X-Patchwork-Delegate: trini@ti.com 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 3x5W1n6kj2z9s0g for ; Mon, 10 Jul 2017 13:30:21 +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="FoS4UWrC"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id AF5A0C21DF0; Mon, 10 Jul 2017 03:27:43 +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=1.1 required=5.0 tests=DATE_IN_PAST_06_12, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 76B83C21E26; Mon, 10 Jul 2017 03:20:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 34314C21DF6; Mon, 10 Jul 2017 03:19:59 +0000 (UTC) Received: from mail-oi0-f48.google.com (mail-oi0-f48.google.com [209.85.218.48]) by lists.denx.de (Postfix) with ESMTPS id 59C5FC21DC0 for ; Mon, 10 Jul 2017 03:19:34 +0000 (UTC) Received: by mail-oi0-f48.google.com with SMTP id l130so64512708oib.1 for ; Sun, 09 Jul 2017 20:19:34 -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=2LADraGG2CDZxPh3h6uPRYBM0NnEARaRK6VCwRAVuqE=; b=FoS4UWrCCXu4mP2fDv9V3NR/AJjgeMW5TZpkM/OeSiXKvi6QDepQZSrvT0gqJLrOcR aZYlGuM4tqFAkMAp5eXmlGphd3X9ra7GFCqM3gvJ3hyVfuvG9iBjn/ANYK8VyoSKTxIV zTHupNko9AWmVZTXBpwquM9O3K2Ow7u7t95j90JHnKpj/f+7FcafcrS/GRbz8inYYJxX oB0Q63MOdfic5p1M/UBGxVb9AHPgq+0sZ+7LTIDL6Dc40UAnc7K1PnIpeMceg8xoNPNM ffmqiF1DDidj82P/IDtrkRYFqb15eBMxJ9uqS/QfBd/tGLm13Sggc5NoDy/C1vAifS1F H2lg== 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=2LADraGG2CDZxPh3h6uPRYBM0NnEARaRK6VCwRAVuqE=; b=rhBCGbWrflUOCc3Y2PlwEtgyBV/sW9E5tqDBQZAvwlflctmX6oEGAKA4GduNInAXrj D10Xdg3o7sdVuQBzAxyeGJV4MSLjxEp2ixaCZyqLP16/JRvDqtB1YpvCMYF5K4fQReoN LZyBl7oYI7TVw0Q6TPHjDWof9PsNsTvekq7Ba9PTeWGqT570CELbYiBDRIaZQQE0qtaA cNggaqDknQNTzdLhu7P6rpAXclfDLKl2MftjSOpyb61pZokKL6FtC3gUMygYzdPUX0vc s+MvJzmQ0tROuo74BXlf6CFdE/VIRvSgMFv8iJzjF4DL8Bv4JMaeWWCw/21dPuDX9GDq XClg== X-Gm-Message-State: AIVw113RQXHY4EaP0ybX9RmBG1mAXYa0uz21n19dsHjo21+Or88UrCBL a1kFuu1nWy6/hIUv X-Received: by 10.202.190.68 with SMTP id o65mr8037312oif.10.1499656773052; Sun, 09 Jul 2017 20:19:33 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([100.101.164.89]) by smtp.gmail.com with ESMTPSA id e67sm13268930oic.39.2017.07.09.20.19.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Jul 2017 20:19:32 -0700 (PDT) Received: by kiwi.bld.corp.google.com (Postfix, from userid 121222) id E9AD9142312; Sun, 9 Jul 2017 21:19:31 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 9 Jul 2017 14:53:01 -0600 Message-Id: <20170709205313.116174-19-sjg@chromium.org> X-Mailer: git-send-email 2.13.2.725.g09c95d1e9-goog In-Reply-To: <20170709205313.116174-1-sjg@chromium.org> References: <20170709205313.116174-1-sjg@chromium.org> Cc: Tom Rini , Andreas Fenkart , Joe Hershberger Subject: [U-Boot] [PATCH 18/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 --- env/nand.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/env/nand.c b/env/nand.c index a67b5ad1ab..e9188539ca 100644 --- a/env/nand.c +++ b/env/nand.c @@ -153,12 +153,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) { int ret = 0; @@ -186,7 +186,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 = {