From 6606a6adfaf8517cff7e5fe0fb206beed80087d5 Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Wed, 16 Oct 2024 17:10:35 +0200 Subject: [PATCH] envtools: make them build again In v2024.10, "make envtools" is broken for at least these defconfigs: am335x_evm_defconfig rpi_3_defconfig rpi_4_defconfig mx7dsabresd_defconfig wandboard_defconfig imx8mp_evk_defconfig The only defconfig we use for which it is not broken is stm32mp13_defconfig. They all work just fine in v2024.07. The symptoms are slightly different, but all related to the fact that some transitively included header uses IS_ENABLED or CONFIG_IS_ENABLED without linux/kconfig.h having already been included. A simple git bisect doesn't produce anything sensible, it ends up at 3a9f642ca94 (crypto: nuvoton: npcm_sha: Support SHA 384/512) which clearly has nothing to do with this. But digging deeper, one eventually finds 0f92fa45603 ("env: Remove and add needed includes"). So at first I tried adding "#include " in include/env_default.h and include/env_flags.h. That fixes it for some, but not all, of the above. For example rpi_3_defconfig still fails, then in log.h complaining about BIT() and u8 not being defined. At least BIT() is should have gotten from bitops.h, except that that's behind ifdef __KERNEL__, so not set for the envtools build. It turns out that the envtools source code in fw_env_private.h already has some hackery to deal with all this, in the form of the __ASSEMBLY__ games it plays before including config.h. It seems that if we just make sure to do that include early enough, so that config.h is indeed parsed with that __ASSEMBLY__ hackery in place, everything builds fine. Fixes: 0f92fa45603 ("env: Remove and add needed includes") Signed-off-by: Rasmus Villemoes Reviewed-by: Tom Rini Reviewed-by: Fabio Estevam --- tools/env/fw_env.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 74451ecb94..425faf380f 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -9,6 +9,8 @@ #define _GNU_SOURCE +#include "fw_env_private.h" + #include #include #include @@ -39,7 +41,6 @@ #include -#include "fw_env_private.h" #include "fw_env.h" struct env_opts default_opts = { -- 2.39.5