This header always included by the build system (see UBOOTINCLUDE) except when building tools, so is unnecessary. Drop it and update the documentation in the common.h header.
Tools generally should not make use of the board config, but a few do. Update the Atmel pmecc tool to cope with this.
Signed-off-by: Simon Glass sjg@chromium.org ---
scripts/Makefile.autoconf | 8 ++------ tools/atmel_pmecc_params.c | 1 + 2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index a0f6783bc7d..0339cef1d91 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -105,17 +105,14 @@ tpl/include/autoconf.mk: tpl/u-boot.cfg # 2. #include <config_uncmd_spl.h> # 3. #include <configs/....h> # 4. #include <asm/config.h> -# 5. #include <linux/kconfig.h> -# 6. #include <config_fallbacks.h> +# 5. #include <config_fallbacks.h> # # 1 should be able to move to Kconfig # 2 should be removed by tidying up a few Kconfig items # 3 uses CONFIG_SYS_CONFIG_NAME and will go away when Kconfig migration is # completed and all files in include/configs are removed # 4 should be removed when all CONFIG options in those files move to Kconfig -# 5 is automatically included by the build system (see UBOOTINCLUDE) so is -# already unnecessary -# 6 should be removed by tidying up a few Kconfig items +# 5 should be removed by tidying up a few Kconfig items # # So all of the above should eventually go away define filechk_config_h @@ -128,7 +125,6 @@ define filechk_config_h echo #include <config_uncmd_spl.h>; \ echo #include <configs/$(CONFIG_SYS_CONFIG_NAME).h>; \ echo #include <asm/config.h>; \ - echo #include <linux/kconfig.h>; \ echo #include <config_fallbacks.h>;) endef
diff --git a/tools/atmel_pmecc_params.c b/tools/atmel_pmecc_params.c index a4ae03f0fd4..bb203427aa0 100644 --- a/tools/atmel_pmecc_params.c +++ b/tools/atmel_pmecc_params.c @@ -14,6 +14,7 @@
#include <config.h> #include <stdlib.h> +#include <linux/kconfig.h>
static int pmecc_get_ecc_bytes(int cap, int sector_size) {