From patchwork Mon Jul 31 14:46:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 795799 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="tVWtP1h0"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xLjBP0g5xz9sN7 for ; Tue, 1 Aug 2017 00:53:33 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D1ABEC22118; Mon, 31 Jul 2017 14:51:12 +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 25662C22170; Mon, 31 Jul 2017 14:48:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5DB99C2218F; Mon, 31 Jul 2017 14:46:50 +0000 (UTC) Received: from mail-oi0-f54.google.com (mail-oi0-f54.google.com [209.85.218.54]) by lists.denx.de (Postfix) with ESMTPS id 0FEB6C22060 for ; Mon, 31 Jul 2017 14:46:45 +0000 (UTC) Received: by mail-oi0-f54.google.com with SMTP id a9so186084815oih.0 for ; Mon, 31 Jul 2017 07:46:45 -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=NMhlaTgydUQqQFfGebDmPCsu4bl5915/vDFv2M5PLPY=; b=tVWtP1h0UBuWSEDFtwrkbEkDRhcelG7VYXBIAtwMi81ZGrhhFYgx+PZ42EU/4PcgPS sgXCx6JZS6H2kHKUX+tAABjg7IfisQUNUdQfWog0lxDHIibo2TYeK4DcUdlEDCuElm4M I4XQ4eSB1MhfZaFrGsVRUK6c+l9SqXJo0rpfZ9sqaK0XlHxO8+Kg1OhUMW/YqYTShrYL 2FiCIgwrRbXY5l0S3O4IhKdc8r0edQihHxKWiSbbcAg21eQMMM4MSHEVbzv8xg7j3TZA p90ECsxIOIHiRXxp7UF/ybmEstLiwB/NmJSUm3dBMohT2er1Z2+fsOqlCLmO9Jd4yfvf eT/g== 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=NMhlaTgydUQqQFfGebDmPCsu4bl5915/vDFv2M5PLPY=; b=MpTU0Qurn1EILjl7saIsSP6JT44TvljO8bHlwm8w2ekHYz6O31sToR/ixjEV2XWiL2 lObAbwQW0cUhTWjIU5/QWfOIf7hjTTXmeGsU35LTMaINHVc6QVGa4WxOxfYvxJ598amV Ew8lrV5r5OAfB2xmt8lTaimBT7DmVXGdfq9bNCVDQvABGoIWZLp/x38O4LLSPR634y2S hDnqKAPGHr/mm6LTmbr9gMbJ1F2zWh36odGlg4hj1LQvQf0L5oe5WygmQ/2J/U38M2m1 8pnPoaaCCfYTtV8gSGyZ5LN1NZ7adKvE3Q3gXSFSy59YbjNpshMq91S8qoBeys3Nw4Zs J1yw== X-Gm-Message-State: AIVw111HFUHusKIJF92i7Tw/ZyPg6q2oIZYCw5bYanVAg4Q/eQgLRjh0 YuqYmBV2FV7dLoct X-Received: by 10.202.180.4 with SMTP id d4mr13073432oif.188.1501512403664; Mon, 31 Jul 2017 07:46:43 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([100.101.164.89]) by smtp.gmail.com with ESMTPSA id q206sm5287686oic.11.2017.07.31.07.46.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Jul 2017 07:46:42 -0700 (PDT) Received: by kiwi.bld.corp.google.com (Postfix, from userid 121222) id D81161403AE; Mon, 31 Jul 2017 08:46:41 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Mon, 31 Jul 2017 08:46:08 -0600 Message-Id: <20170731144630.115616-9-sjg@chromium.org> X-Mailer: git-send-email 2.14.0.rc0.400.g1c36432dff-goog In-Reply-To: <20170731144630.115616-1-sjg@chromium.org> References: <20170731144630.115616-1-sjg@chromium.org> Cc: Tom Rini , Joe Hershberger , Andreas Fenkart Subject: [U-Boot] [PATCH v4 08/29] env: common: Drop env_get_char_memory() 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" This function is the same as env_get_char_spec() apart from dropping the brackets. Drop the brackets from env_get_char_spec() and use that instead of env_get_char_memory(). Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- Changes in v4: None Changes in v3: None Changes in v2: None env/common.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/env/common.c b/env/common.c index f0ffe4ed73..842c0f7fd1 100644 --- a/env/common.c +++ b/env/common.c @@ -28,11 +28,6 @@ struct hsearch_data env_htab = { }; __weak uchar env_get_char_spec(int index) -{ - return *((uchar *)(gd->env_addr + index)); -} - -static uchar env_get_char_memory(int index) { return *(uchar *)(gd->env_addr + index); } @@ -42,8 +37,6 @@ uchar env_get_char(int index) /* 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_spec(index); }