From cf89c5180a1fc871ea172392b476325f284996bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Beh=C3=BAn?= Date: Fri, 22 Oct 2021 15:47:20 +0200 Subject: env: flash: Let generic env_init() assign default environment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Simon Glass --- env/flash.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'env/flash.c') diff --git a/env/flash.c b/env/flash.c index 473e82454de..b3230fd611f 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) { @@ -230,7 +228,6 @@ static int env_flash_init(void) return 0; } - gd->env_addr = (ulong)&default_environment[0]; gd->env_valid = ENV_INVALID; return 0; } -- cgit v1.2.3 From ee483902aeed69025586c38bfb73e6400bf0f9f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Beh=C3=BAn?= Date: Fri, 22 Oct 2021 15:47:21 +0200 Subject: env: flash: Cosmetic fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change tab to space in env_flash_init(). Signed-off-by: Marek Behún Reviewed-by: Simon Glass --- env/flash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'env/flash.c') diff --git a/env/flash.c b/env/flash.c index b3230fd611f..9c8abfa016c 100644 --- a/env/flash.c +++ b/env/flash.c @@ -228,7 +228,7 @@ static int env_flash_init(void) return 0; } - gd->env_valid = ENV_INVALID; + gd->env_valid = ENV_INVALID; return 0; } #endif -- cgit v1.2.3