svn commit: r358497 - in head: . share/man/man4 sys/conf sys/dev/bktr sys/modules sys/modules/bktr sys/modules/bktr/bktr sys/modules/bktr/bktr_mem sys/sys

[Warner Losh]

This broke installworld... Testing a fix now...

Today is not my day :(

Warner

On Sun, Mar 1, 2020 at 12:15 PM Warner Losh <imp at freebsd.org> wrote:

> Author: imp
> Date: Sun Mar  1 19:15:03 2020
> New Revision: 358497
> URL: https://svnweb.freebsd.org/changeset/base/358497
>
> Log:
>   Remove bktr(4)
>
>   Remove the brooktree driver as discussed on arch at . Bump FreeBSD version
> to
>   1300082, though I doubt anything will care.
>
>   Relnote: yes
>
> Deleted:
>   head/share/man/man4/bktr.4
>   head/sys/dev/bktr/CHANGELOG.TXT
>   head/sys/dev/bktr/bktr_audio.c
>   head/sys/dev/bktr/bktr_audio.h
>   head/sys/dev/bktr/bktr_card.c
>   head/sys/dev/bktr/bktr_card.h
>   head/sys/dev/bktr/bktr_core.c
>   head/sys/dev/bktr/bktr_core.h
>   head/sys/dev/bktr/bktr_i2c.c
>   head/sys/dev/bktr/bktr_i2c.h
>   head/sys/dev/bktr/bktr_mem.c
>   head/sys/dev/bktr/bktr_mem.h
>   head/sys/dev/bktr/bktr_os.c
>   head/sys/dev/bktr/bktr_os.h
>   head/sys/dev/bktr/bktr_reg.h
>   head/sys/dev/bktr/bktr_tuner.c
>   head/sys/dev/bktr/bktr_tuner.h
>   head/sys/dev/bktr/ioctl_bt848.h
>   head/sys/dev/bktr/ioctl_meteor.h
>   head/sys/dev/bktr/msp34xx.c
>   head/sys/modules/bktr/Makefile
>   head/sys/modules/bktr/Makefile.inc
>   head/sys/modules/bktr/bktr/Makefile
>   head/sys/modules/bktr/bktr_mem/Makefile
> Modified:
>   head/UPDATING
>   head/share/man/man4/Makefile
>   head/sys/conf/files
>   head/sys/modules/Makefile
>   head/sys/sys/param.h
>
> Modified: head/UPDATING
>
> ==============================================================================
> --- head/UPDATING       Sun Mar  1 18:55:59 2020        (r358496)
> +++ head/UPDATING       Sun Mar  1 19:15:03 2020        (r358497)
> @@ -26,6 +26,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
>         disable the most expensive debugging functionality run
>         "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
>
> +20200301:
> +       Removed brooktree driver (bktr.4) from the tree.
> +
>  20200229:
>         The WITH_GPL_DTC option has been removed.  The BSD-licenced device
> tree
>         compiler in usr.bin/dtc is used on all architectures which use
> dtc, and
>
> Modified: head/share/man/man4/Makefile
>
> ==============================================================================
> --- head/share/man/man4/Makefile        Sun Mar  1 18:55:59 2020
> (r358496)
> +++ head/share/man/man4/Makefile        Sun Mar  1 19:15:03 2020
> (r358497)
> @@ -79,7 +79,6 @@ MAN=  aac.4 \
>         bhnd_pmu.4 \
>         bhndb.4 \
>         bhndb_pci.4 \
> -       bktr.4 \
>         blackhole.4 \
>         bnxt.4 \
>         bpf.4 \
> @@ -601,7 +600,6 @@ MLINKS+=axe.4 if_axe.4
>  MLINKS+=bce.4 if_bce.4
>  MLINKS+=bfe.4 if_bfe.4
>  MLINKS+=bge.4 if_bge.4
> -MLINKS+=bktr.4 brooktree.4
>  MLINKS+=bnxt.4 if_bnxt.4
>  MLINKS+=bridge.4 if_bridge.4
>  MLINKS+=bwi.4 if_bwi.4
>
> Modified: head/sys/conf/files
>
> ==============================================================================
> --- head/sys/conf/files Sun Mar  1 18:55:59 2020        (r358496)
> +++ head/sys/conf/files Sun Mar  1 19:15:03 2020        (r358497)
> @@ -1335,13 +1335,6 @@ dev/bhnd/siba/siba_bhndb.c               optional
> siba bhnd bhndb
>  dev/bhnd/siba/siba_erom.c              optional siba bhnd
>  dev/bhnd/siba/siba_subr.c              optional siba bhnd
>  #
> -dev/bktr/bktr_audio.c          optional bktr pci
> -dev/bktr/bktr_card.c           optional bktr pci
> -dev/bktr/bktr_core.c           optional bktr pci
> -dev/bktr/bktr_i2c.c            optional bktr pci smbus
> -dev/bktr/bktr_os.c             optional bktr pci
> -dev/bktr/bktr_tuner.c          optional bktr pci
> -dev/bktr/msp34xx.c             optional bktr pci
>  dev/bnxt/bnxt_hwrm.c           optional bnxt iflib pci
>  dev/bnxt/bnxt_sysctl.c         optional bnxt iflib pci
>  dev/bnxt/bnxt_txrx.c           optional bnxt iflib pci
>
> Modified: head/sys/modules/Makefile
>
> ==============================================================================
> --- head/sys/modules/Makefile   Sun Mar  1 18:55:59 2020        (r358496)
> +++ head/sys/modules/Makefile   Sun Mar  1 19:15:03 2020        (r358497)
> @@ -67,7 +67,6 @@ SUBDIR=       \
>         bhnd \
>         ${_bxe} \
>         ${_bios} \
> -       ${_bktr} \
>         ${_blake2} \
>         bnxt \
>         bridgestp \
> @@ -583,7 +582,6 @@ _agp=               agp
>  _an=           an
>  _aout=         aout
>  _bios=         bios
> -_bktr=         bktr
>  .if ${MK_SOURCELESS_UCODE} != "no"
>  _bxe=          bxe
>  .endif
>
> Modified: head/sys/sys/param.h
>
> ==============================================================================
> --- head/sys/sys/param.h        Sun Mar  1 18:55:59 2020        (r358496)
> +++ head/sys/sys/param.h        Sun Mar  1 19:15:03 2020        (r358497)
> @@ -60,7 +60,7 @@
>   *             in the range 5 to 9.
>   */
>  #undef __FreeBSD_version
> -#define __FreeBSD_version 1300081      /* Master, propagated to newvers */
> +#define __FreeBSD_version 1300082      /* Master, propagated to newvers */
>
>  /*
>   * __FreeBSD_kernel__ indicates that this system uses the kernel of
> FreeBSD,
>