From 45f3498e56eaad3a478d0cb4608bc1671bee2cb5 Mon Sep 17 00:00:00 2001 From: Yanfeng Liu Date: Wed, 11 Oct 2023 11:28:06 +0800 Subject: [PATCH] doc: build:kconfig:settings rewise CONF_FILE description make item#2 as part of item#1 to reduce confusions. (cherry picked from commit a275e45c856667d687c3092438077e4c75e66788) Original-Signed-off-by: Yanfeng Liu GitOrigin-RevId: a275e45c856667d687c3092438077e4c75e66788 Change-Id: If4013db317a04df355fa68ad102a3b6d130ad60d Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/4933964 Tested-by: ChromeOS Prod (Robot) Commit-Queue: Keith Short Tested-by: Keith Short Reviewed-by: Keith Short --- doc/build/kconfig/setting.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/build/kconfig/setting.rst b/doc/build/kconfig/setting.rst index 38a1fc51e89d28..dbc1ff845d858d 100644 --- a/doc/build/kconfig/setting.rst +++ b/doc/build/kconfig/setting.rst @@ -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_.conf` is used, then if file + Furthermore if ``CONF_FILE`` is set as single configuration file of the + form :file:`prj_.conf` and if file :file:`boards/_.conf` exists in same folder as file :file:`prj_.conf`, the result of merging :file:`prj_.conf` and :file:`boards/_.conf` is used.