kconfig: Clarify Kconfig.defconfig explanation in Kconfig.zephyr

Group the 'source's of Kconfig.defconfig files together to make it
clearer what the comment is talking about. Remove blank lines between
the other 'source's too, splitting the 'source's into two groups.

Also touch up the comment to make it more concrete and shorten it a bit.
Mention that it applies to 'choice's as well.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
This commit is contained in:
Ulf Magnusson 2020-01-26 23:47:41 +01:00 committed by Johan Hedberg
commit e63b6525bf

View file

@ -11,38 +11,27 @@ source "modules/Kconfig"
endmenu endmenu
# Include these first so that any properties (e.g. defaults) below can be # Include Kconfig.defconfig files first so that they can override defaults and
# overridden in *.defconfig files (by defining symbols in multiple locations). # other symbol/choice properties by adding extra symbol/choice definitions.
# After merging all the symbol definitions, Kconfig picks the first property # After merging all definitions for a symbol/choice, Kconfig picks the first
# (e.g. the first default) with a satisfied condition. # property (e.g. the first default) with a satisfied condition.
# #
# Board defaults should be parsed before SoC defaults, because boards usually # Shield defaults should have precedence over board defaults, which should have
# overrides SoC values. Similarly shields defaults should be parsed before # precedence over SoC defaults, so include them in that order.
# boards defaults, because shields defaults override boards defaults.
# #
# Note: $ARCH and $BOARD_DIR might be glob patterns. # $ARCH and $BOARD_DIR will be glob patterns when building documentation.
source "boards/shields/*/Kconfig.defconfig" source "boards/shields/*/Kconfig.defconfig"
source "$(BOARD_DIR)/Kconfig.defconfig" source "$(BOARD_DIR)/Kconfig.defconfig"
source "$(SOC_DIR)/$(ARCH)/*/Kconfig.defconfig" source "$(SOC_DIR)/$(ARCH)/*/Kconfig.defconfig"
source "boards/Kconfig" source "boards/Kconfig"
source "$(SOC_DIR)/Kconfig" source "$(SOC_DIR)/Kconfig"
source "arch/Kconfig" source "arch/Kconfig"
source "kernel/Kconfig" source "kernel/Kconfig"
source "dts/Kconfig" source "dts/Kconfig"
source "drivers/Kconfig" source "drivers/Kconfig"
source "lib/Kconfig" source "lib/Kconfig"
source "subsys/Kconfig" source "subsys/Kconfig"
source "ext/Kconfig" source "ext/Kconfig"
osource "$(TOOLCHAIN_KCONFIG_DIR)/Kconfig" osource "$(TOOLCHAIN_KCONFIG_DIR)/Kconfig"