Skip to content

Commit

Permalink
doc: build:kconfig:settings align with guidelines
Browse files Browse the repository at this point in the history
use unnumbered list to align with guidelines

(cherry picked from commit fc682c3)

Original-Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
GitOrigin-RevId: fc682c3
Change-Id: Ibe20fb5659967d30662513abed9f843381f7e26b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/4933963
Tested-by: ChromeOS Prod (Robot) <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com>
Commit-Queue: Keith Short <keithshort@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Tested-by: Keith Short <keithshort@chromium.org>
  • Loading branch information
yf13 authored and Chromeos LUCI committed Oct 12, 2023
1 parent ae2666b commit f46673d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions doc/build/kconfig/setting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ known as a Kconfig fragment, which are then merged to get the final
configuration used for a particular build). By default, :file:`prj.conf` is
used.

1. If ``CONF_FILE`` is set, the configuration file(s) specified in it are
#. If ``CONF_FILE`` is set, the configuration file(s) specified in it are
merged and used as the application configuration. ``CONF_FILE`` can be set
in various ways:

Expand All @@ -149,25 +149,25 @@ used.

3. From the CMake variable cache

2. Otherwise if ``CONF_FILE`` is set, and a single configuration file of the
#. Otherwise if ``CONF_FILE`` is set, and a single configuration file of the
form :file:`prj_<build>.conf` is used, then 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.

3. Otherwise, :file:`prj_<BOARD>.conf` is used if it exists in the application
#. Otherwise, :file:`prj_<BOARD>.conf` is used if it exists in the application
configuration directory.

4. Otherwise, if :file:`boards/<BOARD>.conf` exists in the application
#. Otherwise, if :file:`boards/<BOARD>.conf` exists in the application
configuration directory, the result of merging it with :file:`prj.conf` is
used.

5. Otherwise, if board revisions are used and
#. Otherwise, if board revisions are used and
:file:`boards/<BOARD>_<revision>.conf` exists in the application
configuration directory, the result of merging it with :file:`prj.conf` and
:file:`boards/<BOARD>.conf` is used.

6. Otherwise, :file:`prj.conf` is used from the application configuration
#. Otherwise, :file:`prj.conf` is used from the application configuration
directory. If it does not exist then a fatal error will be emitted.

All configuration files will be taken from the application's configuration
Expand Down

0 comments on commit f46673d

Please sign in to comment.