From patchwork Thu Aug 3 18:22:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 797402 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="Kw12UJvR"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xNdz46r9lz9s7m for ; Fri, 4 Aug 2017 04:35:28 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 92E27C21DD9; Thu, 3 Aug 2017 18:33:51 +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 D3E64C21E2F; Thu, 3 Aug 2017 18:23:37 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 40535C21EA9; Thu, 3 Aug 2017 18:23:14 +0000 (UTC) Received: from mail-oi0-f47.google.com (mail-oi0-f47.google.com [209.85.218.47]) by lists.denx.de (Postfix) with ESMTPS id 972ACC21E06 for ; Thu, 3 Aug 2017 18:23:03 +0000 (UTC) Received: by mail-oi0-f47.google.com with SMTP id g131so20249761oic.3 for ; Thu, 03 Aug 2017 11:23:03 -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=mLWVCXIcqyPoT9Zh7EtPGV9qLXmhVjc/feXTq6DYSF8=; b=Kw12UJvRx3uPGh7DFrZU0SwP9CwazEl3KFuxpkELCRlRpIDZCPVn9YBOvQOitlTrET pMfZYTtQt0Nk1wXab5DEjAi7ViVegBT0UiFyWNPp6Dl9It068RS7XN6c7rDZM+OA5sf8 Atat8bTln2X5OE4SftmlzrbzEYH8hS4iIuF5X+x4lfxz7bm4VrjB5lztH3E5NbF7UjA9 GN8cYXUcFfaY2bxxS7Au1XkU1p4VbAq34CMcyNxQZyJWIbJSuKwKKNNy3Snj77be9cuP yMMMSlJGcmDORYRnvnjMRSMvmtkQnV30eEJ3qN5xsSBedZSdIpgKZJgVeJdq0Lxfw/9q polQ== 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=mLWVCXIcqyPoT9Zh7EtPGV9qLXmhVjc/feXTq6DYSF8=; b=gAE46UIxGtKdiZ5YtLaXCMqvwAgX568dajVsFnnYeB48q2Fj8GI0Edyd9augm3M1nf 1tNpO04DUP6gtBXymJIpAHQWFAYNCcTb+7D1nYoTpOxBBRCER8KHCqLzMMKNr8z3s25d MaHocknJ7riS7lqP0iVbLwfIvlJ3Q1jvIuZdbSgfcdMsfPx/GggIH+qlKpv20JBg5FOT HIvOAetV/K6eJpfic2FgT4LOBtkwoM7dv4SUroFLzn80r5w/IXOC4roeYSYFKnmKcvkf wZOzns/CxhwSeDBqf6Wry72XtOlTVhYwsJI14mMzeaPadkcpe4F6avl373kDCBwPPIon jRug== X-Gm-Message-State: AHYfb5h7bXhK29Kb8PeluNTNIU/9URm4Z4ePmfj/1/ovelLMLQbVKJ6i MxSepbBA919ZKJUD X-Received: by 10.202.183.6 with SMTP id h6mr2359116oif.166.1501784582112; Thu, 03 Aug 2017 11:23:02 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:0:10f2:0:4999:4b63:9ee7:6e58]) by smtp.gmail.com with ESMTPSA id e137sm6432101oih.36.2017.08.03.11.22.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Aug 2017 11:22:59 -0700 (PDT) Received: by kiwi.bld.corp.google.com (Postfix, from userid 121222) id 23DD81413F5; Thu, 3 Aug 2017 12:22:59 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Thu, 3 Aug 2017 12:22:07 -0600 Message-Id: <20170803182217.149285-21-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 20/30] env: Drop env_relocate_spec() in favour of env_load() 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 is a strange name for a function that loads the environment. There is now only one implementation of this function, so use the new env_load() function directly instead. 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 board/birdland/bav335x/board.c | 2 +- board/gateworks/gw_ventana/gw_ventana_spl.c | 2 +- board/tcl/sl50/board.c | 2 +- board/ti/am335x/board.c | 2 +- board/ti/am57xx/board.c | 2 +- board/ti/dra7xx/evm.c | 2 +- env/common.c | 2 +- env/env.c | 5 ----- include/environment.h | 9 +++++++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/board/birdland/bav335x/board.c b/board/birdland/bav335x/board.c index 67aca3cc43..b49365e157 100644 --- a/board/birdland/bav335x/board.c +++ b/board/birdland/bav335x/board.c @@ -162,7 +162,7 @@ int spl_start_uboot(void) #ifdef CONFIG_SPL_ENV_SUPPORT env_init(); - env_relocate_spec(); + env_load(); if (getenv_yesno("boot_os") != 1) return 1; #endif diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c index 69a638d71d..baa8480b6c 100644 --- a/board/gateworks/gw_ventana/gw_ventana_spl.c +++ b/board/gateworks/gw_ventana/gw_ventana_spl.c @@ -690,7 +690,7 @@ int spl_start_uboot(void) debug("%s\n", __func__); #ifdef CONFIG_SPL_ENV_SUPPORT env_init(); - env_relocate_spec(); + env_load(); debug("boot_os=%s\n", getenv("boot_os")); if (getenv_yesno("boot_os") == 1) ret = 0; diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c index e89ee35d30..d3c953e993 100644 --- a/board/tcl/sl50/board.c +++ b/board/tcl/sl50/board.c @@ -76,7 +76,7 @@ int spl_start_uboot(void) #ifdef CONFIG_SPL_ENV_SUPPORT env_init(); - env_relocate_spec(); + env_load(); if (getenv_yesno("boot_os") != 1) return 1; #endif diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 0a16529b5f..ac0592b725 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -249,7 +249,7 @@ int spl_start_uboot(void) #ifdef CONFIG_SPL_ENV_SUPPORT env_init(); - env_relocate_spec(); + env_load(); if (getenv_yesno("boot_os") != 1) return 1; #endif diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 00a31a97fd..126c9ef694 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -742,7 +742,7 @@ int spl_start_uboot(void) #ifdef CONFIG_SPL_ENV_SUPPORT env_init(); - env_relocate_spec(); + env_load(); if (getenv_yesno("boot_os") != 1) return 1; #endif diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 7d36f03fa1..23be2c70e4 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -825,7 +825,7 @@ int spl_start_uboot(void) #ifdef CONFIG_SPL_ENV_SUPPORT env_init(); - env_relocate_spec(); + env_load(); if (getenv_yesno("boot_os") != 1) return 1; #endif diff --git a/env/common.c b/env/common.c index 9b3a26859f..0cc8829d0d 100644 --- a/env/common.c +++ b/env/common.c @@ -280,7 +280,7 @@ void env_relocate(void) set_default_env("!bad CRC"); #endif } else { - env_relocate_spec(); + env_load(); } } diff --git a/env/env.c b/env/env.c index a239d93156..85d95e5747 100644 --- a/env/env.c +++ b/env/env.c @@ -150,11 +150,6 @@ int env_init(void) return 0; } -void env_relocate_spec(void) -{ - env_load(); -} - int saveenv(void) { return env_save(); diff --git a/include/environment.h b/include/environment.h index 1df243462e..b4f93663da 100644 --- a/include/environment.h +++ b/include/environment.h @@ -170,8 +170,6 @@ extern env_t environment; extern const unsigned char default_environment[]; extern env_t *env_ptr; -extern void env_relocate_spec(void); - #if defined(CONFIG_NEEDS_MANUAL_RELOC) extern void env_reloc(void); #endif @@ -320,6 +318,13 @@ struct env_driver *env_driver_lookup_default(void); */ int env_get_char(int index); +/** + * env_load() - Load the environment from storage + * + * @return 0 if OK, -ve on error + */ +int env_load(void); + #endif /* DO_DEPS_ONLY */ #endif /* _ENVIRONMENT_H_ */