From mboxrd@z Thu Jan 1 00:00:00 1970 From: Patrick Delaunay Date: Thu, 3 Oct 2019 09:24:26 +0200 Subject: [U-Boot] [PATCH v4 1/3] env: correct the check of env_flags_validate presence In-Reply-To: <20191003072428.19197-1-patrick.delaunay@st.com> References: <20191003072428.19197-1-patrick.delaunay@st.com> Message-ID: <20191003072428.19197-2-patrick.delaunay@st.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 --- 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 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 }; -- 2.17.1