leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

env: flash: Let generic env_init() assign default environment

Browse Source 
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>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Marek Behún 2021-10-22 15:47:20 +02:00 committed by Simon Glass
parent 9fc3106219
commit cf89c5180a
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
env/flash.c vendored
View File

@ -77,7 +77,6 @@ static int env_flash_init(void)
uchar flag1 = flash_addr->flags; uchar flag1 = flash_addr->flags;
uchar flag2 = flash_addr_new->flags; uchar flag2 = flash_addr_new->flags;
ulong addr_default = (ulong)&default_environment[0];
ulong addr1 = (ulong)&(flash_addr->data); ulong addr1 = (ulong)&(flash_addr->data);
ulong addr2 = (ulong)&(flash_addr_new->data); ulong addr2 = (ulong)&(flash_addr_new->data);
@ -92,7 +91,6 @@ static int env_flash_init(void)
gd->env_addr = addr2; gd->env_addr = addr2;
gd->env_valid = ENV_VALID; gd->env_valid = ENV_VALID;
} else if (!crc1_ok && !crc2_ok) { } else if (!crc1_ok && !crc2_ok) {
gd->env_addr = addr_default;
gd->env_valid = ENV_INVALID; gd->env_valid = ENV_INVALID;
} else if (flag1 == ENV_REDUND_ACTIVE && } else if (flag1 == ENV_REDUND_ACTIVE &&
flag2 == ENV_REDUND_OBSOLETE) { flag2 == ENV_REDUND_OBSOLETE) {
@ -230,7 +228,6 @@ static int env_flash_init(void)
return 0; return 0;
} }
gd->env_addr = (ulong)&default_environment[0];
gd->env_valid = ENV_INVALID; gd->env_valid = ENV_INVALID;
return 0; return 0;
} }