Re: git: ba9f71ddeca8 - main - sys/modules: simplify a little by moving syscons to x86 only

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
>
>