[U-Boot] [PATCH] Relax check for valid environment in __hwconfig

Alexander Kabaev kan at FreeBSD.org
Wed Jan 10 20:42:33 UTC 2018


The function only needs env_get to be functional, so check
the env_valid flag instead. There is no reason why this function
should not work if environment is available early, say by being
directly mapped in SPI.
---
 common/hwconfig.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/hwconfig.c b/common/hwconfig.c
index e5186d7796..4006aad59c 100644
--- a/common/hwconfig.c
+++ b/common/hwconfig.c
@@ -12,6 +12,7 @@
 #ifndef HWCONFIG_TEST
 #include <config.h>
 #include <common.h>
+#include <environment.h>
 #include <exports.h>
 #include <hwconfig.h>
 #include <linux/types.h>
@@ -76,7 +77,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->env_valid == ENV_INVALID) {
 			printf("WARNING: Calling __hwconfig without a buffer "
 					"and before environment is ready\n");
 			return NULL;
-- 
2.15.1



More information about the U-Boot mailing list