On Fri, Feb 22, 2019 at 05:38:44PM +0100, Philipp Tomsich wrote:
On 21.02.2019, at 11:13, Martyn Welch martyn.welch@collabora.com wrote:
Currently CONFIG_ENV_OFFSET_REDUND is checked regardless of the type of build being performed, but this doesn't seem to be needed in SPL builds.
Don't check this configuration option for SPL builds.
Signed-off-by: Martyn Welch martyn.welch@collabora.com
env/nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/env/nand.c b/env/nand.c index 29eda66fad..d0b95f483d 100644 --- a/env/nand.c +++ b/env/nand.c @@ -26,7 +26,7 @@ #if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_NAND) && \ !defined(CONFIG_SPL_BUILD) #define CMD_SAVEENV -#elif defined(CONFIG_ENV_OFFSET_REDUND) +#elif defined(CONFIG_ENV_OFFSET_REDUND) && !defined(CONFIG_SPL_BUILD) #error CONFIG_ENV_OFFSET_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_NAND #endif
Could we use CONFIG_IS_ENABLED and then differentiate via Kconfig and ENV_OFFSET_REDUND, SPL_ENV_OFFSET_REDUND and TPL_ENV_OFFSET_REDUND?
We need another round of non-trivial ENV related Kconfig migration and then we would remove this hunk entirely and express things correctly. CONFIG_CMD_NAND check here is an abuse from before we had globally a real CONFIG_NAND to check on, and I'm not sure CMD_SAVEENV is _really_ needed (I mean, it is, in order to populate the alt location, I think anyhow).