]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
kconfig: Adjust ordering so that defaults work as expected
authorSimon Glass <sjg@chromium.org>
Tue, 24 Feb 2015 13:26:19 +0000 (22:26 +0900)
committerTom Rini <trini@ti.com>
Tue, 24 Feb 2015 22:05:30 +0000 (17:05 -0500)
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 <sjg@chromium.org>
Reported-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Reviewed-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Kconfig

diff --git a/Kconfig b/Kconfig
index 75bab7f6cc05af4698adf0d6866cc9aaa27a7a56..823f1e2b212220801ceed9d724d0499dee2bf6c5 100644 (file)
--- 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"