summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-02-24 22:26:19 +0900
committerTom Rini <trini@ti.com>2015-02-24 17:05:30 -0500
commit66afaef22889e2685aa500c047b66ac003eea264 (patch)
tree62ae0f8f29c1d850d6935483feeb3901a284dfdd
parent6d4d05b1e9e411c90934e78bae76263f07881186 (diff)
downloadtalos-obmc-uboot-66afaef22889e2685aa500c047b66ac003eea264.tar.gz
talos-obmc-uboot-66afaef22889e2685aa500c047b66ac003eea264.zip
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 <sjg@chromium.org> Reported-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Reviewed-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r--Kconfig5
1 files 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"
OpenPOWER on IntegriCloud