doc: build:kconfig:settings rewise CONF_FILE description

make item#2 as part of item#1 to reduce confusions.

Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
This commit is contained in:
Yanfeng Liu 2023-10-11 11:28:06 +08:00 committed by Johan Hedberg
parent fc682c35a2
commit a275e45c85
1 changed files with 2 additions and 2 deletions

View File

@ -149,8 +149,8 @@ used.
3. From the CMake variable cache
#. Otherwise if ``CONF_FILE`` is set, and a single configuration file of the
form :file:`prj_<build>.conf` is used, then if file
Furthermore if ``CONF_FILE`` is set as single configuration file of the
form :file:`prj_<build>.conf` and if file
:file:`boards/<BOARD>_<build>.conf` exists in same folder as file
:file:`prj_<build>.conf`, the result of merging :file:`prj_<build>.conf` and
:file:`boards/<BOARD>_<build>.conf` is used.