Skip to content

Commit 48170c2

Browse files
gkurzhuth
authored andcommitted
docs: Rename default-configs to configs
This was missed at the time. Fixes: 812b31d ("configs: rename default-configs to configs and reorganise") Signed-off-by: Greg Kurz <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Message-ID: <[email protected]> Signed-off-by: Thomas Huth <[email protected]>
1 parent 825b96d commit 48170c2

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

docs/devel/build-system.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ Target-dependent emulator sourcesets:
260260
Each emulator also includes sources for files in the ``hw/`` and ``target/``
261261
subdirectories. The subdirectory used for each emulator comes
262262
from the target's definition of ``TARGET_BASE_ARCH`` or (if missing)
263-
``TARGET_ARCH``, as found in ``default-configs/targets/*.mak``.
263+
``TARGET_ARCH``, as found in ``configs/targets/*.mak``.
264264

265265
Each subdirectory in ``hw/`` adds one sourceset to the ``hw_arch`` dictionary,
266266
for example::
@@ -317,8 +317,8 @@ Utility sourcesets:
317317
The following files concur in the definition of which files are linked
318318
into each emulator:
319319

320-
``default-configs/devices/*.mak``
321-
The files under ``default-configs/devices/`` control the boards and devices
320+
``configs/devices/*.mak``
321+
The files under ``configs/devices/`` control the boards and devices
322322
that are built into each QEMU system emulation targets. They merely contain
323323
a list of config variable definitions such as::
324324

@@ -327,11 +327,11 @@ into each emulator:
327327
CONFIG_XLNX_VERSAL=y
328328

329329
``*/Kconfig``
330-
These files are processed together with ``default-configs/devices/*.mak`` and
330+
These files are processed together with ``configs/devices/*.mak`` and
331331
describe the dependencies between various features, subsystems and
332332
device models. They are described in :ref:`kconfig`
333333

334-
``default-configs/targets/*.mak``
334+
``configs/targets/*.mak``
335335
These files mostly define symbols that appear in the ``*-config-target.h``
336336
file for each emulator\ [#cfgtarget]_. However, the ``TARGET_ARCH``
337337
and ``TARGET_BASE_ARCH`` will also be used to select the ``hw/`` and

docs/devel/kconfig.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ originated in the Linux kernel, though it was heavily simplified and
3838
the handling of dependencies is stricter in QEMU.
3939

4040
Unlike Linux, there is no user interface to edit the configuration, which
41-
is instead specified in per-target files under the ``default-configs/``
41+
is instead specified in per-target files under the ``configs/``
4242
directory of the QEMU source tree. This is because, unlike Linux,
4343
configuration and dependencies can be treated as a black box when building
4444
QEMU; the default configuration that QEMU ships with should be okay in
@@ -103,7 +103,7 @@ directives can be included:
103103
**default value**: ``default <value> [if <expr>]``
104104

105105
Default values are assigned to the config symbol if no other value was
106-
set by the user via ``default-configs/*.mak`` files, and only if
106+
set by the user via ``configs/*.mak`` files, and only if
107107
``select`` or ``depends on`` directives do not force the value to true
108108
or false respectively. ``<value>`` can be ``y`` or ``n``; it cannot
109109
be an arbitrary Boolean expression. However, a condition for applying
@@ -119,7 +119,7 @@ directives can be included:
119119
This is similar to ``select`` as it applies a lower limit of ``y``
120120
to another symbol. However, the lower limit is only a default
121121
and the "implied" symbol's value may still be set to ``n`` from a
122-
``default-configs/*.mak`` files. The following two examples are
122+
``configs/*.mak`` files. The following two examples are
123123
equivalent::
124124

125125
config FOO
@@ -146,7 +146,7 @@ declares its dependencies in different ways:
146146
bool
147147

148148
Subsystems always default to false (they have no ``default`` directive)
149-
and are never visible in ``default-configs/*.mak`` files. It's
149+
and are never visible in ``configs/*.mak`` files. It's
150150
up to other symbols to ``select`` whatever subsystems they require.
151151

152152
They sometimes have ``select`` directives to bring in other required
@@ -238,7 +238,7 @@ declares its dependencies in different ways:
238238
include libraries (such as ``FDT``) or ``TARGET_BIG_ENDIAN``
239239
(possibly negated).
240240

241-
Boards are listed for convenience in the ``default-configs/*.mak``
241+
Boards are listed for convenience in the ``configs/*.mak``
242242
for the target they apply to.
243243

244244
**internal elements**
@@ -251,18 +251,18 @@ declares its dependencies in different ways:
251251

252252
Internal elements group code that is useful in several boards or
253253
devices. They are usually enabled with ``select`` and in turn select
254-
other elements; they are never visible in ``default-configs/*.mak``
254+
other elements; they are never visible in ``configs/*.mak``
255255
files, and often not even in the Makefile.
256256

257257
Writing and modifying default configurations
258258
--------------------------------------------
259259

260260
In addition to the Kconfig files under hw/, each target also includes
261-
a file called ``default-configs/TARGETNAME-softmmu.mak``. These files
261+
a file called ``configs/TARGETNAME-softmmu.mak``. These files
262262
initialize some Kconfig variables to non-default values and provide the
263263
starting point to turn on devices and subsystems.
264264

265-
A file in ``default-configs/`` looks like the following example::
265+
A file in ``configs/`` looks like the following example::
266266

267267
# Default configuration for alpha-softmmu
268268

0 commit comments

Comments
 (0)