From patchwork Thu Aug 3 18:21:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 797385 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="TqnPEneS"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xNdkv29wFz9s7m for ; Fri, 4 Aug 2017 04:24:55 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 04A5AC21E1D; Thu, 3 Aug 2017 18:24:17 +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_H3, RCVD_IN_MSPIKE_WL, 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 C4C0BC21DF0; Thu, 3 Aug 2017 18:22:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 03437C21E31; Thu, 3 Aug 2017 18:22:46 +0000 (UTC) Received: from mail-oi0-f51.google.com (mail-oi0-f51.google.com [209.85.218.51]) by lists.denx.de (Postfix) with ESMTPS id 943F7C21DA0 for ; Thu, 3 Aug 2017 18:22:42 +0000 (UTC) Received: by mail-oi0-f51.google.com with SMTP id d71so20590380oih.0 for ; Thu, 03 Aug 2017 11:22:42 -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=mDRfwF0Ms96LEiU6+uhxRTuzVJGYBVjcnO8C1B1X8wI=; b=TqnPEneSqNgbzEai1gajcFI7LiCiJbMC2h4ZchSzgGOpAT7yHxoxiEqkt0OBWAd6+9 JaCqGHt+UiTs6UQBoFyRkMmEHnNK5Eu8eMt8z6WEca1J0fO+7dSmBZnRybZtZ5E7ek9W Ae/FawrPi4tijl59r8xt+6QzERrfahEls0IicNF6Ko6RFYQ7MuTcQdSRL2Q2qR1EZWiH ldw9ODuCnyLGCWLV3Vw09J7QA/eQuA5SUjP5aLlke1WNeuLa+x7Z0oOecVY5Rt3SG1/Q M7EG1rBNnK3UKuUtp0ANspG4SGuF/Ixht/a7Ga8Ac4/bFITiCJLmcVdDQ65hGeNQntXC xMSw== 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=mDRfwF0Ms96LEiU6+uhxRTuzVJGYBVjcnO8C1B1X8wI=; b=fRk6Z1ML1XlwqLlyq4b3hSyhEyPKhyLZT0RVVnVkY+XBOuJNDm8bBiZSH7lygCvnjK EZ5o9TxrS906MUIxre2SqqoW+KJpj02/rnQsRUlKLZbeB0dLUJUQvO9lcpMBQWuwQdF8 eN8NX0kSKTKWGtKwEyzROGjnZZg4DOd640VW0lu80x3TJTUEBVv8aduQ9HLcLhbSzVsd GYfhpr8M6v6uGuP7SUhZLp8AloJ4O/cbMz1gkaDsRpQzO6+DgNtMwlJB8NK1de5Knogq 6BJ53+NsYSQ9lSnOXx2r2lUCB1u9QCt5oEejdcd7zkZjDFeFwsBjSRtYJlp4wvFupqQ+ C6mA== X-Gm-Message-State: AHYfb5i31l523dd6ysvwNchP3ozQQt5EZQnhNOnIbIXvQS8o3q34Eir/ fAEkWySQNAozM0GM X-Received: by 10.202.237.193 with SMTP id l184mr2538104oih.308.1501784561204; Thu, 03 Aug 2017 11:22:41 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([100.101.164.89]) by smtp.gmail.com with ESMTPSA id y12sm24120915oie.40.2017.08.03.11.22.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Aug 2017 11:22:40 -0700 (PDT) Received: by kiwi.bld.corp.google.com (Postfix, from userid 121222) id 6643D141719; Thu, 3 Aug 2017 12:22:39 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Thu, 3 Aug 2017 12:21:53 -0600 Message-Id: <20170803182217.149285-7-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 06/30] env: common: Factor out the common env_valid check 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" The check for gd->env_valid is used in both the 'if' and 'else' part of env_get_char(). Move it into that function instead for simplicity. Drop that code from the two leaf functions. 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/common.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/env/common.c b/env/common.c index 2e94dd71e2..bfa8cfb143 100644 --- a/env/common.c +++ b/env/common.c @@ -34,25 +34,20 @@ __weak uchar env_get_char_spec(int index) static uchar env_get_char_init(int index) { - /* if crc was bad, use the default environment */ - if (gd->env_valid) - return env_get_char_spec(index); - else - return default_environment[index]; + return env_get_char_spec(index); } static uchar env_get_char_memory(int index) { - if (gd->env_valid) - return *(uchar *)(gd->env_addr + index); - else - return default_environment[index]; + return *(uchar *)(gd->env_addr + index); } uchar env_get_char(int index) { - /* if relocated to RAM */ - if (gd->flags & GD_FLG_RELOC) + /* if env is not set up, or crc was bad, use the default environment */ + if (!gd->env_valid) + return default_environment[index]; + else if (gd->flags & GD_FLG_RELOC) /* if relocated to RAM */ return env_get_char_memory(index); else return env_get_char_init(index);