docs/devel/build-system.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
Commit 812b31d3f9 (configs: rename default-configs to configs and
reorganise, 2021-07-07) did the rename.
Reflect that update also in the documentation.
Signed-off-by: Kashyap Chamarthy <kchamart@redhat.com>
---
docs/devel/build-system.rst | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst
index 0f636d620e..bfa5250802 100644
--- a/docs/devel/build-system.rst
+++ b/docs/devel/build-system.rst
@@ -250,7 +250,7 @@ Target-dependent emulator sourcesets:
Each emulator also includes sources for files in the ``hw/`` and ``target/``
subdirectories. The subdirectory used for each emulator comes
from the target's definition of ``TARGET_BASE_ARCH`` or (if missing)
- ``TARGET_ARCH``, as found in ``default-configs/targets/*.mak``.
+ ``TARGET_ARCH``, as found in ``configs/targets/*.mak``.
Each subdirectory in ``hw/`` adds one sourceset to the ``hw_arch`` dictionary,
for example::
@@ -307,8 +307,8 @@ Utility sourcesets:
The following files concur in the definition of which files are linked
into each emulator:
-``default-configs/devices/*.mak``
- The files under ``default-configs/devices/`` control the boards and devices
+``configs/devices/*.mak``
+ The files under ``configs/devices/`` control the boards and devices
that are built into each QEMU system emulation targets. They merely contain
a list of config variable definitions such as::
@@ -317,11 +317,11 @@ into each emulator:
CONFIG_XLNX_VERSAL=y
``*/Kconfig``
- These files are processed together with ``default-configs/devices/*.mak`` and
+ These files are processed together with ``configs/devices/*.mak`` and
describe the dependencies between various features, subsystems and
device models. They are described in :ref:`kconfig`
-``default-configs/targets/*.mak``
+``configs/targets/*.mak``
These files mostly define symbols that appear in the ``*-config-target.h``
file for each emulator [#cfgtarget]_. However, the ``TARGET_ARCH``
and ``TARGET_BASE_ARCH`` will also be used to select the ``hw/`` and
@@ -460,7 +460,7 @@ Built by Meson:
TARGET-NAME is again the name of a system or userspace emulator. The
config-devices.mak file is automatically generated by make using the
scripts/make_device_config.sh program, feeding it the
- default-configs/$TARGET-NAME file as input.
+ configs/$TARGET-NAME file as input.
``config-host.h``, ``$TARGET-NAME/config-target.h``, ``$TARGET-NAME/config-devices.h``
These files are used by source code to determine what features
--
2.31.1
Kashyap Chamarthy <kchamart@redhat.com> writes: > Commit 812b31d3f9 (configs: rename default-configs to configs and > reorganise, 2021-07-07) did the rename. > > Reflect that update also in the documentation. Thanks for fixing this up. Reviewed-by: Alex Bennée <alex.bennee@linaro.org> -- Alex Bennée Virtualisation Tech Lead @ Linaro
There are also several "default-configs" in docs/devel/kconfig.rst, I think they can also be updated in this patch. BR, Lei On 10/4/2021 15:12, Kashyap Chamarthy wrote: > Commit 812b31d3f9 (configs: rename default-configs to configs and > reorganise, 2021-07-07) did the rename. > > Reflect that update also in the documentation. > > Signed-off-by: Kashyap Chamarthy <kchamart@redhat.com> > --- > docs/devel/build-system.rst | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst > index 0f636d620e..bfa5250802 100644 > --- a/docs/devel/build-system.rst > +++ b/docs/devel/build-system.rst > @@ -250,7 +250,7 @@ Target-dependent emulator sourcesets: > Each emulator also includes sources for files in the ``hw/`` and ``target/`` > subdirectories. The subdirectory used for each emulator comes > from the target's definition of ``TARGET_BASE_ARCH`` or (if missing) > - ``TARGET_ARCH``, as found in ``default-configs/targets/*.mak``. > + ``TARGET_ARCH``, as found in ``configs/targets/*.mak``. > > Each subdirectory in ``hw/`` adds one sourceset to the ``hw_arch`` dictionary, > for example:: > @@ -307,8 +307,8 @@ Utility sourcesets: > The following files concur in the definition of which files are linked > into each emulator: > > -``default-configs/devices/*.mak`` > - The files under ``default-configs/devices/`` control the boards and devices > +``configs/devices/*.mak`` > + The files under ``configs/devices/`` control the boards and devices > that are built into each QEMU system emulation targets. They merely contain > a list of config variable definitions such as:: > > @@ -317,11 +317,11 @@ into each emulator: > CONFIG_XLNX_VERSAL=y > > ``*/Kconfig`` > - These files are processed together with ``default-configs/devices/*.mak`` and > + These files are processed together with ``configs/devices/*.mak`` and > describe the dependencies between various features, subsystems and > device models. They are described in :ref:`kconfig` > > -``default-configs/targets/*.mak`` > +``configs/targets/*.mak`` > These files mostly define symbols that appear in the ``*-config-target.h`` > file for each emulator [#cfgtarget]_. However, the ``TARGET_ARCH`` > and ``TARGET_BASE_ARCH`` will also be used to select the ``hw/`` and > @@ -460,7 +460,7 @@ Built by Meson: > TARGET-NAME is again the name of a system or userspace emulator. The > config-devices.mak file is automatically generated by make using the > scripts/make_device_config.sh program, feeding it the > - default-configs/$TARGET-NAME file as input. > + configs/$TARGET-NAME file as input. > > ``config-host.h``, ``$TARGET-NAME/config-target.h``, ``$TARGET-NAME/config-devices.h`` > These files are used by source code to determine what features
On Fri, May 12, 2023 at 04:09:20PM +0800, Wang, Lei wrote: > There are also several "default-configs" in docs/devel/kconfig.rst, I think they > can also be updated in this patch. Good catch, I'll respin it. > BR, > Lei > > On 10/4/2021 15:12, Kashyap Chamarthy wrote: > > Commit 812b31d3f9 (configs: rename default-configs to configs and > > reorganise, 2021-07-07) did the rename. > > > > Reflect that update also in the documentation. > > > > Signed-off-by: Kashyap Chamarthy <kchamart@redhat.com> > > --- > > docs/devel/build-system.rst | 12 ++++++------ > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst > > index 0f636d620e..bfa5250802 100644 > > --- a/docs/devel/build-system.rst > > +++ b/docs/devel/build-system.rst > > @@ -250,7 +250,7 @@ Target-dependent emulator sourcesets: > > Each emulator also includes sources for files in the ``hw/`` and ``target/`` > > subdirectories. The subdirectory used for each emulator comes > > from the target's definition of ``TARGET_BASE_ARCH`` or (if missing) > > - ``TARGET_ARCH``, as found in ``default-configs/targets/*.mak``. > > + ``TARGET_ARCH``, as found in ``configs/targets/*.mak``. > > > > Each subdirectory in ``hw/`` adds one sourceset to the ``hw_arch`` dictionary, > > for example:: > > @@ -307,8 +307,8 @@ Utility sourcesets: > > The following files concur in the definition of which files are linked > > into each emulator: [...] -- /kashyap
On 10/4/21 09:12, Kashyap Chamarthy wrote: > Commit 812b31d3f9 (configs: rename default-configs to configs and > reorganise, 2021-07-07) did the rename. > > Reflect that update also in the documentation. > > Signed-off-by: Kashyap Chamarthy <kchamart@redhat.com> > --- > docs/devel/build-system.rst | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
© 2016 - 2026 Red Hat, Inc.