[U-Boot] [PATCH v4 1/3] env: correct the check of env_flags_validate presence

Tom Rini
2019-10-03T13:18:17Z

On Thu, Oct 03, 2019 at 09:24:26AM +0200, Patrick Delaunay wrote:

> This patch corrects the check of env_flags_validate presence because
> "flags.c" is always compiled in U-Boot and CONFIG_ENV_SUPPORT
> don't exist; so the macro CONFIG_IS_ENABLED(ENV_SUPPORT) only provides
> the expected result for SPL and TPL (check activation of
> CONFIG_SPL_ENV_SUPPORT and CONFIG_TPL_ENV_SUPPORT).
>
> This patch solves the regression introduced by
> commit 7d4776545b0f ("env: solve compilation error
> in SPL"); change_ok was always NULL in U-Boot.
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
> ---
>
> Changes in v4: None
> Changes in v3: None
> Changes in v2: None
>
> env/common.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/env/common.c b/env/common.c
> index 3fb60509dd..f677b5b0da 100644
> --- a/env/common.c
> +++ b/env/common.c
> @@ -24,8 +24,10 @@ DECLARE_GLOBAL_DATA_PTR;
> #include <env_default.h>
>
> struct hsearch_data env_htab = {
> -#if CONFIG_IS_ENABLED(ENV_SUPPORT)
> - /* defined in flags.c, only compile with ENV_SUPPORT */
> +#if !defined(CONFIG_SPL_BUILD) || CONFIG_IS_ENABLED(ENV_SUPPORT)
> + /* defined in flags.c, only compiled in U-Boot or
> + * with $(SPL_TPL_)ENV_SUPPORT
> + */
> .change_ok = env_flags_validate,
> #endif
> };

Joe? Wolfgang? Or Heiko (since you could verify the regression is fixed)?

Thanks!

--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191003/8835a6da/attachment.sig>