From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Thu, 11 Jan 2018 11:32:43 -0500 Subject: [U-Boot] [PATCH] Relax check for valid environment in __hwconfig In-Reply-To: <20180110204233.77975-1-kan@FreeBSD.org> References: <20180110204233.77975-1-kan@FreeBSD.org> Message-ID: <20180111163243.GH4660@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Wed, Jan 10, 2018 at 08:42:33PM +0000, Alexander Kabaev wrote: > 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 > #include > +#include > #include > #include > #include > @@ -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; Since you're changing the check here, please change the printf as well to match the new check. Thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: