diff mbox

[U-Boot,v5,2/4] kconfig: Adjust ordering so that defaults work as expected

Message ID 1424784387-24061-3-git-send-email-yamada.m@jp.panasonic.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Masahiro Yamada Feb. 24, 2015, 1:26 p.m. UTC 
From: Simon Glass <sjg@chromium.org>

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>
---

Changes in v5: None
Changes in v3:
  - The same as what Simon posted
    http://patchwork.ozlabs.org/patch/441670/
    Included in this series to clarify the order

Changes in v2: None

 Kconfig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Tom Rini Feb. 25, 2015, 12:03 a.m. UTC | #1 
On Tue, Feb 24, 2015 at 10:26:19PM +0900, Masahiro Yamada wrote:

> From: Simon Glass <sjg@chromium.org>
> 
> 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>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/Kconfig b/Kconfig
index 75bab7f..823f1e2 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"