Date: Thu, 7 Nov 2024 19:19:13 -0800 From: Warner Losh <imp@bsdimp.com> To: Jessica Clarke <jrtc27@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>" <dev-commits-src-main@freebsd.org> Subject: Re: git: d2434697bc9c - main - loader.kboot: Build on amd64 Message-ID: <CANCZdfpNNoftfcLQBWiv8YR45sEE=8XoR7VU083Un=Qnw4e22A@mail.gmail.com> In-Reply-To: <5B288C0C-5A9A-4772-8B14-06BDCC527B04@freebsd.org> References: <202411080059.4A80xv9q000454@gitrepo.freebsd.org> <5B288C0C-5A9A-4772-8B14-06BDCC527B04@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000cea0c506265e3729 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Nov 7, 2024, 5:03=E2=80=AFPM Jessica Clarke <jrtc27@freebsd.org> wr= ote: > On 8 Nov 2024, at 00:59, Warner Losh <imp@FreeBSD.org> wrote: > > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dd2434697bc9cc2d36da0f356cc5942b= 33df87896 > > > > commit d2434697bc9cc2d36da0f356cc5942b33df87896 > > Author: Warner Losh <imp@FreeBSD.org> > > AuthorDate: 2024-11-07 22:59:04 +0000 > > Commit: Warner Losh <imp@FreeBSD.org> > > CommitDate: 2024-11-07 23:23:26 +0000 > > > > loader.kboot: Build on amd64 > > > > But comment out FDT stuff for amd64 built inside kboot. This also > > restricts a bit the powerpc platforms we build on to powerpc64. > > > > Sponsored by: Netflix > > --- > > stand/Makefile | 2 +- > > stand/kboot/kboot/Makefile | 5 ++++- > > stand/kboot/kboot/main.c | 5 ++++- > > 3 files changed, 9 insertions(+), 3 deletions(-) > > > > diff --git a/stand/Makefile b/stand/Makefile > > index ce91802d4a8b..5d81e5f8a032 100644 > > --- a/stand/Makefile > > +++ b/stand/Makefile > > @@ -37,7 +37,7 @@ INTERP_DEPENDS+=3D lua > > .include <bsd.arch.inc.mk> > > > > S.${MK_EFI}+=3D efi > > -.if ${MK_FDT} !=3D "no" > > +.if ${MACHINE_ARCH} =3D=3D "amd64" || ${MACHINE_ARCH} =3D=3D "aarch64"= || > ${MACHINE_ARCH} =3D=3D "powerpc64" > > S.${MK_LOADER_KBOOT}+=3D kboot > > .endif > > Hm, is the outer if really needed? We already have: > > # KBOOT is only for powerpc64 (powerpc64le broken) amd64 and aarch64 > .if ${__T} !=3D "powerpc64" && ${__T} !=3D "amd64" && ${__T} !=3D =E2= =80=9Caarch64" > BROKEN_OPTIONS+=3DLOADER_KBOOT > .endif > > in src.opts.mk, which is generally where these kinds of restrictions > should live. > Oh. That's a great idea. I'll update. Warner > --000000000000cea0c506265e3729 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"auto"><div><br><br><div class=3D"gmail_quote"><div dir=3D"ltr" = class=3D"gmail_attr">On Thu, Nov 7, 2024, 5:03=E2=80=AFPM Jessica Clarke &l= t;<a href=3D"mailto:jrtc27@freebsd.org">jrtc27@freebsd.org</a>> wrote:<b= r></div><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border= -left:1px #ccc solid;padding-left:1ex">On 8 Nov 2024, at 00:59, Warner Losh= <imp@FreeBSD.org> wrote:<br> > <br> > The branch main has been updated by imp:<br> > <br> > URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3Dd2434697bc9c= c2d36da0f356cc5942b33df87896" rel=3D"noreferrer noreferrer" target=3D"_blan= k">https://cgit.FreeBSD.org/src/commit/?id=3Dd2434697bc9cc2d36da0f356cc5942= b33df87896</a><br> > <br> > commit d2434697bc9cc2d36da0f356cc5942b33df87896<br> > Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org><br> > AuthorDate: 2024-11-07 22:59:04 +0000<br> > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org><br> > CommitDate: 2024-11-07 23:23:26 +0000<br> > <br> >=C2=A0 =C2=A0 loader.kboot:=C2=A0 Build on amd64<br> > <br> >=C2=A0 =C2=A0 But comment out FDT stuff for amd64 built inside kboot. T= his also<br> >=C2=A0 =C2=A0 restricts a bit the powerpc platforms we build on to powe= rpc64.<br> > <br> >=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Net= flix<br> > ---<br> > stand/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 2 +-<b= r> > stand/kboot/kboot/Makefile | 5 ++++-<br> > stand/kboot/kboot/main.c=C2=A0 =C2=A0| 5 ++++-<br> > 3 files changed, 9 insertions(+), 3 deletions(-)<br> > <br> > diff --git a/stand/Makefile b/stand/Makefile<br> > index ce91802d4a8b..5d81e5f8a032 100644<br> > --- a/stand/Makefile<br> > +++ b/stand/Makefile<br> > @@ -37,7 +37,7 @@ INTERP_DEPENDS+=3D lua<br> > .include <<a href=3D"http://bsd.arch.inc.mk" rel=3D"noreferrer nore= ferrer" target=3D"_blank">bsd.arch.inc.mk</a>><br> > <br> > S.${MK_EFI}+=3D efi<br> > -.if ${MK_FDT} !=3D "no"<br> > +.if ${MACHINE_ARCH} =3D=3D "amd64" || ${MACHINE_ARCH} =3D= =3D "aarch64" || ${MACHINE_ARCH} =3D=3D "powerpc64"<br> > S.${MK_LOADER_KBOOT}+=3D kboot<br> > .endif<br> <br> Hm, is the outer if really needed? We already have:<br> <br> =C2=A0 # KBOOT is only for powerpc64 (powerpc64le broken) amd64 and aarch64= <br> =C2=A0 .if ${__T} !=3D "powerpc64" && ${__T} !=3D "a= md64" && ${__T} !=3D =E2=80=9Caarch64"<br> =C2=A0 BROKEN_OPTIONS+=3DLOADER_KBOOT<br> =C2=A0 .endif<br> <br> in <a href=3D"http://src.opts.mk" rel=3D"noreferrer noreferrer" target=3D"_= blank">src.opts.mk</a>, which is generally where these kinds of restriction= s<br> should live.<br></blockquote></div></div><div dir=3D"auto"><br></div><div d= ir=3D"auto">Oh. That's a great idea. I'll update.</div><div dir=3D"= auto"><br></div><div dir=3D"auto">Warner</div><div dir=3D"auto"><div class= =3D"gmail_quote"><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8= ex;border-left:1px #ccc solid;padding-left:1ex"> </blockquote></div></div></div> --000000000000cea0c506265e3729--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpNNoftfcLQBWiv8YR45sEE=8XoR7VU083Un=Qnw4e22A>