Date: Fri, 28 Oct 2022 12:12:55 -0600 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 Subject: Re: git: ba9f71ddeca8 - main - sys/modules: simplify a little by moving syscons to x86 only Message-ID: <CANCZdfodkZmLGuV0kCL7cU12dKVe=ZJJA-U_LRynk%2B-y=Q7B0A@mail.gmail.com> In-Reply-To: <CBAC32CF-40FD-4714-BD89-2E1B2E680557@freebsd.org> References: <202210281753.29SHrut7052860@gitrepo.freebsd.org> <CBAC32CF-40FD-4714-BD89-2E1B2E680557@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000a39f0d05ec1c35ea Content-Type: text/plain; charset="UTF-8" On Fri, Oct 28, 2022, 11:57 AM Jessica Clarke <jrtc27@freebsd.org> wrote: > On 28 Oct 2022, at 18:53, Warner Losh <imp@FreeBSD.org> wrote: > > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=ba9f71ddeca84404e318b86078c91620f3d6375d > > > > commit ba9f71ddeca84404e318b86078c91620f3d6375d > > Author: Warner Losh <imp@FreeBSD.org> > > AuthorDate: 2022-10-28 17:51:02 +0000 > > Commit: Warner Losh <imp@FreeBSD.org> > > CommitDate: 2022-10-28 17:52:40 +0000 > > > > sys/modules: simplify a little by moving syscons to x86 only > > > > syscons is x86 only now that sparc has been retired. No need for the > > extra if. Also alphabetize p2sb. > > > > Sponsored by: Netflix > > --- > > sys/modules/Makefile | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/sys/modules/Makefile b/sys/modules/Makefile > > index 9784473fc522..1b03d41b5bd8 100644 > > --- a/sys/modules/Makefile > > +++ b/sys/modules/Makefile > > @@ -632,7 +632,6 @@ SUBDIR+= zfs > > > > .if ${MACHINE_CPUARCH} != "aarch64" && ${MACHINE_CPUARCH} != "arm" && \ > > ${MACHINE_CPUARCH} != "powerpc" && ${MACHINE_CPUARCH} != "riscv" > > -_syscons= syscons > > .endif > > This is now empty? > Doh. Yea. I thought I'd killed that. Will fix :( Warner > Jess > > > .if ${MK_SOURCELESS_UCODE} != "no" > > @@ -693,6 +692,7 @@ _mgb= mgb > > _nctgpio= nctgpio > > _ntb= ntb > > _ocs_fc= ocs_fc > > +_p2sb= p2sb > > _qat= qat > > _qatfw= qatfw > > _qat_c2xxx= qat_c2xxx > > @@ -703,7 +703,7 @@ _rdma= rdma > > _safe= safe > > _speaker= speaker > > _splash= splash > > -_p2sb= p2sb > > +_syscons= syscons > > _wbwd= wbwd > > > > _aac= aac > > --000000000000a39f0d05ec1c35ea 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 Fri, Oct 28, 2022, 11:57 AM Jessica Clarke <<a h= ref=3D"mailto:jrtc27@freebsd.org">jrtc27@freebsd.org</a>> wrote:<br></di= v><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:= 1px #ccc solid;padding-left:1ex">On 28 Oct 2022, at 18:53, 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=3Dba9f71ddeca8= 4404e318b86078c91620f3d6375d" rel=3D"noreferrer noreferrer" target=3D"_blan= k">https://cgit.FreeBSD.org/src/commit/?id=3Dba9f71ddeca84404e318b86078c916= 20f3d6375d</a><br> > <br> > commit ba9f71ddeca84404e318b86078c91620f3d6375d<br> > Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org><br> > AuthorDate: 2022-10-28 17:51:02 +0000<br> > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org><br> > CommitDate: 2022-10-28 17:52:40 +0000<br> > <br> >=C2=A0 =C2=A0 sys/modules: simplify a little by moving syscons to x86 o= nly<br> > <br> >=C2=A0 =C2=A0 syscons is x86 only now that sparc has been retired. No n= eed for the<br> >=C2=A0 =C2=A0 extra if. Also alphabetize p2sb.<br> > <br> >=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Net= flix<br> > ---<br> > sys/modules/Makefile | 4 ++--<br> > 1 file changed, 2 insertions(+), 2 deletions(-)<br> > <br> > diff --git a/sys/modules/Makefile b/sys/modules/Makefile<br> > index 9784473fc522..1b03d41b5bd8 100644<br> > --- a/sys/modules/Makefile<br> > +++ b/sys/modules/Makefile<br> > @@ -632,7 +632,6 @@ SUBDIR+=3D=C2=A0 zfs<br> > <br> > .if ${MACHINE_CPUARCH} !=3D "aarch64" && ${MACHINE_C= PUARCH} !=3D "arm" && \<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0${MACHINE_CPUARCH} !=3D "powerpc" = && ${MACHINE_CPUARCH} !=3D "riscv"<br> > -_syscons=3D=C2=A0 =C2=A0 syscons<br> > .endif<br> <br> This is now empty?<br></blockquote></div></div><div dir=3D"auto"><br></div>= <div dir=3D"auto"><br></div><div dir=3D"auto">Doh. Yea.=C2=A0 =C2=A0I thoug= ht I'd killed that. Will fix :(</div><div dir=3D"auto"><br></div><div d= ir=3D"auto">Warner=C2=A0</div><div dir=3D"auto"><div class=3D"gmail_quote">= <blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p= x #ccc solid;padding-left:1ex"> Jess<br> <br> > .if ${MK_SOURCELESS_UCODE} !=3D "no"<br> > @@ -693,6 +692,7 @@ _mgb=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0mgb<br> > _nctgpio=3D=C2=A0 =C2=A0 =C2=A0nctgpio<br> > _ntb=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ntb<br> > _ocs_fc=3D=C2=A0 =C2=A0 =C2=A0 ocs_fc<br> > +_p2sb=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0p2sb<b= r> > _qat=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0qat<br> > _qatfw=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0qatfw<= br> > _qat_c2xxx=3D=C2=A0 =C2=A0qat_c2xxx<br> > @@ -703,7 +703,7 @@ _rdma=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = rdma<br> > _safe=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 safe<b= r> > _speaker=3D=C2=A0 =C2=A0 =C2=A0speaker<br> > _splash=3D=C2=A0 =C2=A0 =C2=A0 splash<br> > -_p2sb=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0p2sb<b= r> > +_syscons=3D=C2=A0 =C2=A0 syscons<br> > _wbwd=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 wbwd<b= r> > <br> > _aac=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0aac<br> <br> </blockquote></div></div></div> --000000000000a39f0d05ec1c35ea--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfodkZmLGuV0kCL7cU12dKVe=ZJJA-U_LRynk%2B-y=Q7B0A>