[PATCH] hwconfig: Allow to use restricted env

[PATCH] hwconfig: Allow to use restricted env

[Pali Rohár]

During early boot phase GD_FLG_ENV_READY is not set but env_get() may work
when env is ready in restricted mode. Do not fail with error message
"WARNING: Calling __hwconfig without a buffer and before environment is ready"
when env is already working by checking for ENV_VALID flag.

Signed-off-by: Pali Rohár <pali@kernel.org>
---
 common/hwconfig.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/hwconfig.c b/common/hwconfig.c
index 43566b81bd48..cac0b6348f46 100644
--- a/common/hwconfig.c
+++ b/common/hwconfig.c
@@ -78,7 +78,7 @@ static const char *__hwconfig(const char *opt, size_t *arglen,
 
 	/* if we are passed a buffer use it, otherwise try the environment */
 	if (!env_hwconfig) {
-		if (!(gd->flags & GD_FLG_ENV_READY)) {
+		if (!(gd->flags & GD_FLG_ENV_READY) && gd->env_valid != ENV_VALID) {
 			printf("WARNING: Calling __hwconfig without a buffer "
 					"and before environment is ready\n");
 			return NULL;
-- 
2.20.1

Re: [PATCH] hwconfig: Allow to use restricted env

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 458 bytes --]

On Sun, Aug 07, 2022 at 09:06:04PM +0200, Pali Rohár wrote:

> During early boot phase GD_FLG_ENV_READY is not set but env_get() may work
> when env is ready in restricted mode. Do not fail with error message
> "WARNING: Calling __hwconfig without a buffer and before environment is ready"
> when env is already working by checking for ENV_VALID flag.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]