Skip to content

Commit

Permalink
doc: build:kconfig:settings rewise CONF_FILE description
Browse files Browse the repository at this point in the history
make item#2 as part of item#1 to reduce confusions.

(cherry picked from commit a275e45)

Original-Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
GitOrigin-RevId: a275e45
Change-Id: If4013db317a04df355fa68ad102a3b6d130ad60d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/4933964
Tested-by: ChromeOS Prod (Robot) <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com>
Commit-Queue: Keith Short <keithshort@chromium.org>
Tested-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
  • Loading branch information
yf13 authored and Chromeos LUCI committed Oct 12, 2023
1 parent f46673d commit 45f3498
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions doc/build/kconfig/setting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 45f3498

Please sign in to comment.