From patchwork Sun Aug 20 10:45:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 803696 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="Lmq51pGu"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xZtm626mkz9t1t for ; Sun, 20 Aug 2017 20:46:30 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 185A0C21FAB; Sun, 20 Aug 2017 10:45:56 +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 583A6C21FDC; Sun, 20 Aug 2017 10:45:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 640FAC21FD3; Sun, 20 Aug 2017 10:45:29 +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 0F43EC21F61 for ; Sun, 20 Aug 2017 10:45:26 +0000 (UTC) Received: by mail-oi0-f48.google.com with SMTP id f11so131588723oic.0 for ; Sun, 20 Aug 2017 03:45:26 -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=ual+oOVHToXvUGkBPy1R5KDvbSmHhksokWqy5TEKkt8=; b=Lmq51pGuqZpBgyY8Xk0VAujzABivVnQVxoHjzn9LJaH+kBQR9evCRSBsY5FclbbL8Y x2ztkR9NXo8GAyVy/ZN1/+QlNWuqkfYgD/hXgorST0HduB3w3LJpdIjJksCSq+nvuTOp m9eRgEeBwOAzZIQWteWuESm1+AxKXmnTvs82huJE4DmGcG4EQ+iPU03hLlhhHaQeAoW/ MIXtpkiYrQVCauHBLQbIbaK34c5qVrK5XDjszkR7u78bZn5mIN1q+7Qy7X/EY4TzY0/w 4DKvg8aikUB9LvtVN9dTQWkMztJ4VSwa7t4rNb5yrTXVdjVy4gWGWlzTixlsr0YiGYM4 4Cuw== 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=ual+oOVHToXvUGkBPy1R5KDvbSmHhksokWqy5TEKkt8=; b=sAAafOf4TtNZxTCv/4isMJVlZOOX8rp+o6Cq7rarVAFVBjzVJOs/6VDdBr1Noo/Tai 1L/lzSNoN3AU5HGsuvrFPPth6RTiU1b+eUFie5Mrj0A7lpnBNl9+dWbpFNXlToQ0sCeB Z3ooBoOZ8OFwSAm6gRS3xs5R/+R1myEjy48vb0RMZCi7rf/2Hy2IPzYoa0W7kj9LjhIM qFN+OZEL5mzTVY/mkQpSLhgVURqNZ82B1mg8MAeMUUc6R4WdrBCj+N3S8CUq1pP72bXg yB+BbgAYmjwFmOr0RnF3d9MdnqGDpPIZF/lzhTi3DyFPxYWHl7gRRUsy+RVurA7A4jzm r2XQ== X-Gm-Message-State: AHYfb5gGLROQxfSdU7699NIj9D3c8Uc9/wuRUtJgIuCof7Pam480Z34n Lyy5th3MP18ARpW+ X-Received: by 10.202.62.138 with SMTP id l132mr17623523oia.315.1503225924608; Sun, 20 Aug 2017 03:45:24 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([100.101.164.89]) by smtp.gmail.com with ESMTPSA id w128sm10849481oiw.9.2017.08.20.03.45.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Aug 2017 03:45:21 -0700 (PDT) Received: by kiwi.bld.corp.google.com (Postfix, from userid 121222) id BF64B141FB0; Sun, 20 Aug 2017 04:45:20 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 20 Aug 2017 04:45:15 -0600 Message-Id: <20170820104516.156451-3-sjg@chromium.org> X-Mailer: git-send-email 2.14.1.480.gb18f417b89-goog In-Reply-To: <20170820104516.156451-1-sjg@chromium.org> References: <20170820104516.156451-1-sjg@chromium.org> Cc: Tom Rini , Joe Hershberger , Jagan Teki , Stefan Roese , Fiach Antaw Subject: [U-Boot] [PATCH 3/3] env: Replace all open-coded gd->env_valid values with ENV_ flags 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" Some of these were missed in the conversion. Signed-off-by: Simon Glass --- env/common.c | 20 ++++++++++---------- env/eeprom.c | 6 +++--- env/env.c | 2 +- env/flash.c | 4 ++-- env/nand.c | 2 +- env/nvram.c | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/env/common.c b/env/common.c index 688d5ab4c8..b403bd5f6c 100644 --- a/env/common.c +++ b/env/common.c @@ -52,7 +52,7 @@ char *env_get_default(const char *name) /* Pretend that the image is bad. */ gd->flags &= ~GD_FLG_ENV_READY; - gd->env_valid = 0; + gd->env_valid = ENV_INVALID; ret_val = env_get(name); gd->env_valid = really_valid; gd->flags = real_gd_flags; @@ -210,24 +210,24 @@ int env_import_redund(const char *buf1, const char *buf2) set_default_env("!bad CRC"); return 0; } else if (crc1_ok && !crc2_ok) { - gd->env_valid = 1; + gd->env_valid = ENV_VALID; } else if (!crc1_ok && crc2_ok) { - gd->env_valid = 2; + gd->env_valid = ENV_REDUND; } else { /* both ok - check serial */ if (tmp_env1->flags == 255 && tmp_env2->flags == 0) - gd->env_valid = 2; + gd->env_valid = ENV_REDUND; else if (tmp_env2->flags == 255 && tmp_env1->flags == 0) - gd->env_valid = 1; + gd->env_valid = ENV_VALID; else if (tmp_env1->flags > tmp_env2->flags) - gd->env_valid = 1; + gd->env_valid = ENV_VALID; else if (tmp_env2->flags > tmp_env1->flags) - gd->env_valid = 2; + gd->env_valid = ENV_REDUND; else /* flags are equal - almost impossible */ - gd->env_valid = 1; + gd->env_valid = ENV_VALID; } - if (gd->env_valid == 1) + if (gd->env_valid == ENV_VALID) ep = tmp_env1; else ep = tmp_env2; @@ -271,7 +271,7 @@ void env_relocate(void) env_reloc(); env_htab.change_ok += gd->reloc_off; #endif - if (gd->env_valid == 0) { + if (gd->env_valid == ENV_INVALID) { #if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD) /* Environment not changable */ set_default_env(NULL); diff --git a/env/eeprom.c b/env/eeprom.c index 08ef6307fc..584379ebd2 100644 --- a/env/eeprom.c +++ b/env/eeprom.c @@ -122,7 +122,7 @@ static int env_eeprom_load(void) if (!crc_ok[0] && !crc_ok[1]) { gd->env_addr = 0; - gd->env_valid = 0; + gd->env_valid = ENV_INVALID; } else if (crc_ok[0] && !crc_ok[1]) { gd->env_valid = ENV_VALID; } else if (!crc_ok[0] && crc_ok[1]) { @@ -166,9 +166,9 @@ static int env_eeprom_load(void) } if (crc == new) { - gd->env_valid = ENV_VALID; + gd->env_valid = ENV_VALID; } else { - gd->env_valid = 0; + gd->env_valid = ENV_INVALID; } #endif /* CONFIG_ENV_OFFSET_REDUND */ diff --git a/env/env.c b/env/env.c index 1255d57f48..43290d0832 100644 --- a/env/env.c +++ b/env/env.c @@ -74,7 +74,7 @@ int env_get_char(int index) struct env_driver *drv = env_driver_lookup_default(); int ret; - if (!gd->env_valid) + if (gd->env_valid == ENV_INVALID) return default_environment[index]; if (!drv) return -ENODEV; diff --git a/env/flash.c b/env/flash.c index b60be57a8d..bac10ff985 100644 --- a/env/flash.c +++ b/env/flash.c @@ -94,7 +94,7 @@ static int env_flash_init(void) gd->env_valid = ENV_VALID; } else if (!crc1_ok && !crc2_ok) { gd->env_addr = addr_default; - gd->env_valid = 0; + gd->env_valid = ENV_INVALID; } else if (flag1 == ACTIVE_FLAG && flag2 == OBSOLETE_FLAG) { gd->env_addr = addr1; gd->env_valid = ENV_VALID; @@ -231,7 +231,7 @@ static int env_flash_init(void) } gd->env_addr = (ulong)&default_environment[0]; - gd->env_valid = 0; + gd->env_valid = ENV_INVALID; return 0; } #endif diff --git a/env/nand.c b/env/nand.c index dea7b00720..8058b55c50 100644 --- a/env/nand.c +++ b/env/nand.c @@ -79,7 +79,7 @@ static int env_nand_init(void) if (!crc1_ok && !crc2_ok) { gd->env_addr = 0; - gd->env_valid = 0; + gd->env_valid = ENV_INVALID; return 0; } else if (crc1_ok && !crc2_ok) { diff --git a/env/nvram.c b/env/nvram.c index 5fb3115ce6..c8b34754ef 100644 --- a/env/nvram.c +++ b/env/nvram.c @@ -106,7 +106,7 @@ static int env_nvram_init(void) gd->env_valid = ENV_VALID; } else { gd->env_addr = (ulong)&default_environment[0]; - gd->env_valid = 0; + gd->env_valid = ENV_INVALID; } return 0;