diff --git a/doc/build/kconfig/setting.rst b/doc/build/kconfig/setting.rst index 2fd78ff463b97e..dbc1ff845d858d 100644 --- a/doc/build/kconfig/setting.rst +++ b/doc/build/kconfig/setting.rst @@ -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: @@ -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 - 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. -3. Otherwise, :file:`prj_.conf` is used if it exists in the application +#. Otherwise, :file:`prj_.conf` is used if it exists in the application configuration directory. -4. Otherwise, if :file:`boards/.conf` exists in the application +#. Otherwise, if :file:`boards/.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/_.conf` exists in the application configuration directory, the result of merging it with :file:`prj.conf` and :file:`boards/.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