From 66afaef22889e2685aa500c047b66ac003eea264 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 24 Feb 2015 22:26:19 +0900 Subject: [PATCH] kconfig: Adjust ordering so that defaults work as expected At present defaults in arch-specific Kconfig files are ignored if the top-level item comes ahead of it in include order. This means that it is not possible to have a U-Boot default that architectures and boards can override. This does not seem very useful. Move the include earlier to support this. Signed-off-by: Simon Glass Reported-by: Masahiro Yamada Reviewed-by: Masahiro Yamada --- Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Kconfig b/Kconfig index 75bab7f6cc..823f1e2b21 100644 --- a/Kconfig +++ b/Kconfig @@ -12,6 +12,9 @@ config KCONFIG_OBJDIR string option env="KCONFIG_OBJDIR" +# Allow defaults in arch-specific code to override any given here +source "arch/Kconfig" + menu "General setup" config LOCALVERSION @@ -172,8 +175,6 @@ config SYS_CLK_FREQ endmenu # Boot images -source "arch/Kconfig" - source "common/Kconfig" source "dts/Kconfig" -- 2.25.1