Date: Mon, 2 May 2022 14:17:57 -0600 From: Warner Losh <imp@bsdimp.com> To: Ed Maste <emaste@freebsd.org> Cc: Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, dev-commits-src-main@freebsd.org Subject: Re: git: ff8d9d9c5618 - main - config.mk: Add opt_platform.h support Message-ID: <CANCZdfo4SiCfcSf2hNMSi8-dUSeh3iPv_2B2OujY%2B1kAxakjmA@mail.gmail.com> In-Reply-To: <CAPyFy2AQyTKHTSS5Y4QaypJhfmmiaDybeGkXS23Q8EaLJcJu%2BQ@mail.gmail.com> References: <202204051955.235JtxdD052454@gitrepo.freebsd.org> <CAPyFy2AQyTKHTSS5Y4QaypJhfmmiaDybeGkXS23Q8EaLJcJu%2BQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000002ba3d405de0d1783 Content-Type: text/plain; charset="UTF-8" On Mon, May 2, 2022 at 1:39 PM Ed Maste <emaste@freebsd.org> wrote: > On Tue, 5 Apr 2022 at 15:56, Warner Losh <imp@freebsd.org> wrote: > > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=ff8d9d9c56185d38f507ffe2659cfd13633b9a12 > > > > commit ff8d9d9c56185d38f507ffe2659cfd13633b9a12 > > Author: Warner Losh <imp@FreeBSD.org> > > AuthorDate: 2022-04-05 19:39:09 +0000 > > Commit: Warner Losh <imp@FreeBSD.org> > > CommitDate: 2022-04-05 19:52:55 +0000 > > > > config.mk: Add opt_platform.h support > > > > opt_platform.h is now included from miivar.h, so add support for > > generating it in the standalone build case. > > This broke generation of src.conf.5, which reports that WITHOUT_FDT is > the default after this change. Running `make makman` reports: > amd64/amd64: ignoring duplicate option FDT > arm/armv6: ignoring duplicate option FDT > ... > > Indeed, `make showconfig` shows MK_FDT is both yes and no: > $ make showconfig | grep FDT > MK_FDT = no > MK_FDT = yes > Indeed. I'll get the userland and kernel back in sync. Warner --0000000000002ba3d405de0d1783 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">= <div dir=3D"ltr" class=3D"gmail_attr">On Mon, May 2, 2022 at 1:39 PM Ed Mas= te <<a href=3D"mailto:emaste@freebsd.org">emaste@freebsd.org</a>> wro= te:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px = 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Tue, 5 Ap= r 2022 at 15:56, Warner Losh <<a href=3D"mailto:imp@freebsd.org" target= =3D"_blank">imp@freebsd.org</a>> wrote:<br> ><br> > The branch main has been updated by imp:<br> ><br> > URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3Dff8d9d9c5618= 5d38f507ffe2659cfd13633b9a12" rel=3D"noreferrer" target=3D"_blank">https://= cgit.FreeBSD.org/src/commit/?id=3Dff8d9d9c56185d38f507ffe2659cfd13633b9a12<= /a><br> ><br> > commit ff8d9d9c56185d38f507ffe2659cfd13633b9a12<br> > Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org><br> > AuthorDate: 2022-04-05 19:39:09 +0000<br> > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org><br> > CommitDate: 2022-04-05 19:52:55 +0000<br> ><br> >=C2=A0 =C2=A0 =C2=A0<a href=3D"http://config.mk" rel=3D"noreferrer" tar= get=3D"_blank">config.mk</a>: Add opt_platform.h support<br> ><br> >=C2=A0 =C2=A0 =C2=A0opt_platform.h is now included from miivar.h, so ad= d support for<br> >=C2=A0 =C2=A0 =C2=A0generating it in the standalone build case.<br> <br> This broke generation of src.conf.5, which reports that WITHOUT_FDT is<br> the default after this change. Running `make makman` reports:<br> amd64/amd64: ignoring duplicate option FDT<br> arm/armv6: ignoring duplicate option FDT<br> ...<br> <br> Indeed, `make showconfig` shows MK_FDT is both yes and no:<br> $ make showconfig | grep FDT<br> MK_FDT=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=3D no<br> MK_FDT=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=3D yes<br></blockquote><div= ><br></div><div>Indeed. I'll get the userland and kernel back in sync.<= /div><div><br></div><div>Warner=C2=A0</div></div></div> --0000000000002ba3d405de0d1783--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfo4SiCfcSf2hNMSi8-dUSeh3iPv_2B2OujY%2B1kAxakjmA>