ec3eff57e0
Up until now, Zephyr has patched Kconfig to use the last 'default' with
a satisfied condition, instead of the first one. I'm not sure why the
patch was added (it predates Kconfiglib), but I suspect it's related to
Kconfig.defconfig files.
There are at least three problems with the patch:
1. It's inconsistent with how Kconfig works in other projects, which
might confuse newcomers.
2. Due to oversights, earlier 'range' properties are still preferred,
as well as earlier 'default' properties on choices.
In addition to being inconsistent, this makes it impossible to
override 'range' properties and choice 'default' properties if the
base definition of the symbol/choice already has 'range'/'default'
properties.
I've seen errors caused by the inconsistency, and I suspect there
are more.
3. A fork of Kconfiglib that adds the patch needs to be maintained.
Get rid of the patch and go back to standard Kconfig behavior, as
follows:
1. Include the Kconfig.defconfig files first instead of last in
Kconfig.zephyr.
2. Include boards/Kconfig and arch/<arch>/Kconfig first instead of
last in arch/Kconfig.
3. Include arch/<arch>/soc/*/Kconfig first instead of last in
arch/<arch>/Kconfig.
4. Swap a few other 'source's to preserve behavior for some scattered
symbols with multiple definitions.
Swap 'source's in some no-op cases too, where it might match the
intent.
5. Reverse the defaults on symbol definitions that have more than one
default.
Skip defaults that are mutually exclusive, e.g. where each default
has an 'if <some board>' condition. They are already safe.
6. Remove the prefer-later-defaults patch from Kconfiglib.
Testing was done with a Python script that lists all Kconfig
symbols/choices with multiple defaults, along with a whitelist of fixed
symbols. The script also verifies that there are no "unreachable"
defaults hidden by defaults without conditions
As an additional test, zephyr/.config was generated before and after the
change for several samples and checked to be identical (after sorting).
This commit includes some default-related cleanups as well:
- Simplify some symbol definitions, e.g. where a default has 'if FOO'
when the symbol already has 'depends on FOO'.
- Remove some redundant 'default ""' for string symbols. This is the
implicit default.
Piggyback fixes for swapped ranges on BT_L2CAP_RX_MTU and
BT_L2CAP_TX_MTU (caused by confusing inconsistency).
Piggyback some fixes for style nits too, e.g. unindented help texts.
Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
62 lines
1.3 KiB
Plaintext
62 lines
1.3 KiB
Plaintext
#
|
|
# Copyright (c) 2016 Nordic Semiconductor ASA
|
|
#
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
#
|
|
|
|
config HAS_SEGGER_RTT
|
|
bool
|
|
|
|
if HAS_SEGGER_RTT
|
|
|
|
config SEGGER_SYSTEMVIEW
|
|
bool
|
|
prompt "Segger SystemView support"
|
|
select RTT_CONSOLE
|
|
|
|
config SEGGER_RTT_MAX_NUM_UP_BUFFERS
|
|
int "Maximum number of up-buffers"
|
|
default 3
|
|
|
|
config SEGGER_RTT_MAX_NUM_DOWN_BUFFERS
|
|
int "Maximum number of down-buffers"
|
|
default 3
|
|
|
|
config SEGGER_RTT_BUFFER_SIZE_UP
|
|
int "Size of the buffer for terminal output of target, up to host"
|
|
default 1024
|
|
|
|
config SEGGER_RTT_BUFFER_SIZE_DOWN
|
|
int "Size of the buffer for terminal input of target, from host"
|
|
default 16
|
|
|
|
config SEGGER_RTT_PRINTF_BUFFER_SIZE
|
|
int "Size of buffer for RTT printf to bulk-send chars via RTT"
|
|
default 64
|
|
|
|
choice
|
|
prompt "Mode for pre-initialized terminal channel (buffer 0)"
|
|
default SEGGER_RTT_MODE_NO_BLOCK_SKIP
|
|
|
|
config SEGGER_RTT_MODE_NO_BLOCK_SKIP
|
|
bool "Skip. Do not block, output nothing."
|
|
|
|
config SEGGER_RTT_MODE_NO_BLOCK_TRIM
|
|
bool "Trim: Do not block, output as much as fits."
|
|
|
|
config SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL
|
|
bool "Block: Wait until there is space in the buffer."
|
|
|
|
endchoice
|
|
|
|
config SEGGER_RTT_MODE
|
|
int
|
|
default 2 if SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL
|
|
default 1 if SEGGER_RTT_MODE_NO_BLOCK_TRIM
|
|
default 0
|
|
|
|
config SEGGER_RTT_MEMCPY_USE_BYTELOOP
|
|
bool "Use a simple byte-loop instead of standard memcpy"
|
|
|
|
endif
|