diff mbox series

[07/14] env: nowhere: Let generic env_init() assign default environment

Message ID 20211022134725.26004-8-kabel@kernel.org
State Accepted
Commit 5aab7f5dec8ff7679bdfe36a99364f2a7f6948f9
Delegated to: Simon Glass
Headers show
Series Some more env fixes | expand

Commit Message

Marek Behún Oct. 22, 2021, 1:47 p.m. UTC 
From: Marek Behún <marek.behun@nic.cz>

env_nowhere_init() assigns default environment if ENV_INVALID, but this
is done in the generic env_init() function, which calls this
initializer, so drop it from here.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 env/nowhere.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Simon Glass Oct. 22, 2021, 4:08 p.m. UTC | #1 
On Fri, 22 Oct 2021 at 07:47, Marek Behún <kabel@kernel.org> wrote:
>
> From: Marek Behún <marek.behun@nic.cz>
>
> env_nowhere_init() assigns default environment if ENV_INVALID, but this
> is done in the generic env_init() function, which calls this
> initializer, so drop it from here.
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
> ---
>  env/nowhere.c | 1 -
>  1 file changed, 1 deletion(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>
Simon Glass Oct. 31, 2021, 12:57 p.m. UTC | #2 
On Fri, 22 Oct 2021 at 07:47, Marek Behún <kabel@kernel.org> wrote:
>
> From: Marek Behún <marek.behun@nic.cz>
>
> env_nowhere_init() assigns default environment if ENV_INVALID, but this
> is done in the generic env_init() function, which calls this
> initializer, so drop it from here.
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
> ---
>  env/nowhere.c | 1 -
>  1 file changed, 1 deletion(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-dm, thanks!
diff mbox series

Patch

diff --git a/env/nowhere.c b/env/nowhere.c
index 1fcf503453..dc93b6f2e4 100644
--- a/env/nowhere.c
+++ b/env/nowhere.c
@@ -22,7 +22,6 @@  DECLARE_GLOBAL_DATA_PTR;
  */
 static int env_nowhere_init(void)
 {
-	gd->env_addr	= (ulong)&default_environment[0];
 	gd->env_valid	= ENV_INVALID;
 
 	return 0;