From: "Marek Behún" <kabel@kernel.org>
To: u-boot-board-maintainers@lists.denx.de,
u-boot-custodians@lists.denx.de, Tom Rini <trini@konsulko.com>,
Simon Glass <sjg@chromium.org>,
u-boot@lists.denx.de, Joe Hershberger <joe.hershberger@ni.com>,
Wolfgang Denk <wd@denx.de>
Cc: "Marek Behún" <marek.behun@nic.cz>
Subject: [PATCH 09/14] env: flash: Let generic env_init() assign default environment
Date: Fri, 22 Oct 2021 15:47:20 +0200 [thread overview]
Message-ID: <20211022134725.26004-10-kabel@kernel.org> (raw)
In-Reply-To: <20211022134725.26004-1-kabel@kernel.org>
From: Marek Behún <marek.behun@nic.cz>
env_flash_init() (both implementations) 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/flash.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/env/flash.c b/env/flash.c
index ebee9069e4..77d4c030a5 100644
--- a/env/flash.c
+++ b/env/flash.c
@@ -77,7 +77,6 @@ static int env_flash_init(void)
uchar flag1 = flash_addr->flags;
uchar flag2 = flash_addr_new->flags;
- ulong addr_default = (ulong)&default_environment[0];
ulong addr1 = (ulong)&(flash_addr->data);
ulong addr2 = (ulong)&(flash_addr_new->data);
@@ -92,7 +91,6 @@ static int env_flash_init(void)
gd->env_addr = addr2;
gd->env_valid = ENV_VALID;
} else if (!crc1_ok && !crc2_ok) {
- gd->env_addr = addr_default;
gd->env_valid = ENV_INVALID;
} else if (flag1 == ENV_REDUND_ACTIVE &&
flag2 == ENV_REDUND_OBSOLETE) {
@@ -231,7 +229,6 @@ static int env_flash_init(void)
return 0;
}
- gd->env_addr = (ulong)&default_environment[0];
gd->env_valid = ENV_INVALID;
return 0;
}
--
2.32.0
next prev parent reply other threads:[~2021-10-22 13:49 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-22 13:47 [PATCH 00/14] Some more env fixes Marek Behún
2021-10-22 13:47 ` [PATCH 01/14] env: sf: Cosmetic fix in env_sf_init_addr() Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-10-22 13:47 ` [PATCH 02/14] env: sf: Use ENV_VALID enum names instead of literals Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-10-22 13:47 ` [PATCH 03/14] env: sf: Put ENV_INVALID into gd->env_valid on CRC failure Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-22 13:47 ` [PATCH 04/14] env: nand: Put ENV_INVALID into gd->env_valid if default environment Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-10-22 13:47 ` [PATCH 05/14] env: nvram: Let generic env_init() assign " Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-10-22 13:47 ` [PATCH 06/14] env: nvram: Cosmetic fix in env_nvram_init() Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-10-22 13:47 ` [PATCH 07/14] env: nowhere: Let generic env_init() assign default environment Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-10-22 13:47 ` [PATCH 08/14] env: nowhere: Cosmetic fix Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-10-22 13:47 ` Marek Behún [this message]
2021-10-22 16:08 ` [PATCH 09/14] env: flash: Let generic env_init() assign default environment Simon Glass
2021-10-22 13:47 ` [PATCH 10/14] env: flash: Cosmetic fix Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-10-22 13:47 ` [PATCH 11/14] board: synquacer: developerbox: Don't set gd->env_addr to default_environment Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:57 ` Simon Glass
2021-11-17 4:58 ` Masami Hiramatsu
2021-11-17 20:36 ` Simon Glass
2021-11-18 5:40 ` Masami Hiramatsu
2021-11-18 5:45 ` [PATCH] Revert "board: synquacer: developerbox: Don't set gd->env_addr to default_environment" Masami Hiramatsu
2021-11-18 13:42 ` Marek Behún
2021-11-18 23:27 ` Tom Rini
2021-10-22 13:47 ` [PATCH 12/14] board: freescale: various boards: Let env subsystem set gd->env_addr Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:56 ` Simon Glass
2021-10-22 13:47 ` [PATCH 13/14] env: Always use char for default_environment Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:56 ` Simon Glass
2021-10-22 13:47 ` [PATCH 14/14] env: Use static_assert() to check if default_environment is too large Marek Behún
2021-10-22 16:08 ` Simon Glass
2021-10-31 12:56 ` Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211022134725.26004-10-kabel@kernel.org \
--to=kabel@kernel.org \
--cc=joe.hershberger@ni.com \
--cc=marek.behun@nic.cz \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot-board-maintainers@lists.denx.de \
--cc=u-boot-custodians@lists.denx.de \
--cc=u-boot@lists.denx.de \
--cc=wd@denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.