On Thu, Aug 15, 2019 at 1:06 AM Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx> wrote: > > These three variables are not intended to be tweaked by users. > Move them from kbuild.rst to makefiles.rst. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx> > --- > Applied to linux-kbuild. > I will apply to linux-kbuild this > to avoid conflicts. > > > Documentation/kbuild/kbuild.rst | 14 -------------- > Documentation/kbuild/makefiles.rst | 14 ++++++++++++++ > 2 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/Documentation/kbuild/kbuild.rst b/Documentation/kbuild/kbuild.rst > index 61b2181ed3ea..62f9d86c082c 100644 > --- a/Documentation/kbuild/kbuild.rst > +++ b/Documentation/kbuild/kbuild.rst > @@ -258,17 +258,3 @@ KBUILD_BUILD_USER, KBUILD_BUILD_HOST > These two variables allow to override the user@host string displayed during > boot and in /proc/version. The default value is the output of the commands > whoami and host, respectively. > - > -KBUILD_LDS > ----------- > -The linker script with full path. Assigned by the top-level Makefile. > - > -KBUILD_VMLINUX_OBJS > -------------------- > -All object files for vmlinux. They are linked to vmlinux in the same > -order as listed in KBUILD_VMLINUX_OBJS. > - > -KBUILD_VMLINUX_LIBS > -------------------- > -All .a "lib" files for vmlinux. KBUILD_VMLINUX_OBJS and KBUILD_VMLINUX_LIBS > -together specify all the object files used to link vmlinux. > diff --git a/Documentation/kbuild/makefiles.rst b/Documentation/kbuild/makefiles.rst > index f4f0f7ffde2b..d3448d2c8017 100644 > --- a/Documentation/kbuild/makefiles.rst > +++ b/Documentation/kbuild/makefiles.rst > @@ -995,6 +995,20 @@ When kbuild executes, the following steps are followed (roughly): > top-level Makefile has set any other flags. This provides a > means for an architecture to override the defaults. > > + KBUILD_LDS > + > + The linker script with full path. Assigned by the top-level Makefile. > + > + KBUILD_VMLINUX_OBJS > + > + All object files for vmlinux. They are linked to vmlinux in the same > + order as listed in KBUILD_VMLINUX_OBJS. > + > + KBUILD_VMLINUX_LIBS > + > + All .a "lib" files for vmlinux. KBUILD_VMLINUX_OBJS and > + KBUILD_VMLINUX_LIBS together specify all the object files used to > + link vmlinux. > > 6.2 Add prerequisites to archheaders > ------------------------------------ > -- > 2.17.1 > -- Best Regards Masahiro Yamada
