svn commit: r356110 - in stable: 11/sys/arm/broadcom/bcm2835 11/sys/arm/freescale/imx 11/sys/arm/ti/am335x 11/sys/arm/versatile 11/sys/dev/terasic/mtl 11/sys/powerpc/ofw 12/sys/arm/broadcom/bcm2835...

[Kyle Evans]

Author: kevans
Date: Fri Dec 27 03:00:18 2019
New Revision: 356110
URL: https://svnweb.freebsd.org/changeset/base/356110

Log:
  MFC r355936, r356045: remove unused kbd drivers
  
  r355936:
  Kill off dummy kbd drivers
  
  As far as I can tell, these are an artifact of times when linker sets
  couldn't be empty, otherwise the kernel build would fail due to unresolved
  symbols. hselasky fixed this in r268138, and I've audited the kbd portions
  to make sure nothing would blow up due to the empty linker set and
  successfully compiled+ran a kernel with no keyboard support at all.
  
  Kill them off now since they're no longer required.
  
  r356045:
  terasic_mtl: kill off final dummy keyboard driver
  
  The rest were removed in r355936, which speculated that the cause of this
  phenomenon was due to an inability to have an empty linker set. The comment
  included with this one shows that this was, in fact, not the reason.
  
  Regardless, syscons no longer seems to have an issue with not having any
  keyboard drivers and in-fact ignores the keyboard probe anyways.

Modified:
  stable/12/sys/arm/broadcom/bcm2835/bcm2835_fb.c
  stable/12/sys/arm/freescale/imx/imx51_ipuv3.c
  stable/12/sys/arm/ti/am335x/am335x_lcd_syscons.c
  stable/12/sys/arm/versatile/versatile_clcd.c
  stable/12/sys/dev/terasic/mtl/terasic_mtl_syscons.c
  stable/12/sys/powerpc/ofw/ofw_syscons.c
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/arm/broadcom/bcm2835/bcm2835_fb.c
  stable/11/sys/arm/freescale/imx/imx51_ipuv3.c
  stable/11/sys/arm/ti/am335x/am335x_lcd_syscons.c
  stable/11/sys/arm/versatile/versatile_clcd.c
  stable/11/sys/dev/terasic/mtl/terasic_mtl_syscons.c
  stable/11/sys/powerpc/ofw/ofw_syscons.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/sys/arm/broadcom/bcm2835/bcm2835_fb.c
==============================================================================
--- stable/12/sys/arm/broadcom/bcm2835/bcm2835_fb.c	Fri Dec 27 01:50:16 2019	(r356109)
+++ stable/12/sys/arm/broadcom/bcm2835/bcm2835_fb.c	Fri Dec 27 03:00:18 2019	(r356110)
@@ -850,22 +850,3 @@ bcmfb_putm(video_adapter_t *adp, int x, int y, uint8_t
 
 	return (0);
 }
-
-/*
- * Define a stub keyboard driver in case one hasn't been
- * compiled into the kernel
- */
-#include <sys/kbio.h>
-#include <dev/kbd/kbdreg.h>
-
-static int dummy_kbd_configure(int flags);
-
-keyboard_switch_t bcmdummysw;
-
-static int
-dummy_kbd_configure(int flags)
-{
-
-	return (0);
-}
-KEYBOARD_DRIVER(bcmdummy, bcmdummysw, dummy_kbd_configure);

Modified: stable/12/sys/arm/freescale/imx/imx51_ipuv3.c
==============================================================================
--- stable/12/sys/arm/freescale/imx/imx51_ipuv3.c	Fri Dec 27 01:50:16 2019	(r356109)
+++ stable/12/sys/arm/freescale/imx/imx51_ipuv3.c	Fri Dec 27 03:00:18 2019	(r356110)
@@ -878,22 +878,3 @@ ipu3fb_putm(video_adapter_t *adp, int x, int y, uint8_
 
 	return (0);
 }
-
-/*
- * Define a stub keyboard driver in case one hasn't been
- * compiled into the kernel
- */
-#include <sys/kbio.h>
-#include <dev/kbd/kbdreg.h>
-
-static int dummy_kbd_configure(int flags);
-
-keyboard_switch_t ipu3dummysw;
-
-static int
-dummy_kbd_configure(int flags)
-{
-
-	return (0);
-}
-KEYBOARD_DRIVER(ipu3dummy, ipu3dummysw, dummy_kbd_configure);

Modified: stable/12/sys/arm/ti/am335x/am335x_lcd_syscons.c
==============================================================================
--- stable/12/sys/arm/ti/am335x/am335x_lcd_syscons.c	Fri Dec 27 01:50:16 2019	(r356109)
+++ stable/12/sys/arm/ti/am335x/am335x_lcd_syscons.c	Fri Dec 27 03:00:18 2019	(r356110)
@@ -770,22 +770,3 @@ int am335x_lcd_syscons_setup(vm_offset_t vaddr, vm_pad
 
 	return (0);
 }
-
-/*
- * Define a stub keyboard driver in case one hasn't been
- * compiled into the kernel
- */
-#include <sys/kbio.h>
-#include <dev/kbd/kbdreg.h>
-
-static int dummy_kbd_configure(int flags);
-
-keyboard_switch_t am335x_dummysw;
-
-static int
-dummy_kbd_configure(int flags)
-{
-
-	return (0);
-}
-KEYBOARD_DRIVER(am335x_dummy, am335x_dummysw, dummy_kbd_configure);

Modified: stable/12/sys/arm/versatile/versatile_clcd.c
==============================================================================
--- stable/12/sys/arm/versatile/versatile_clcd.c	Fri Dec 27 01:50:16 2019	(r356109)
+++ stable/12/sys/arm/versatile/versatile_clcd.c	Fri Dec 27 03:00:18 2019	(r356110)
@@ -920,22 +920,3 @@ versatilefb_putm(video_adapter_t *adp, int x, int y, u
 
 	return (0);
 }
-
-/*
- * Define a stub keyboard driver in case one hasn't been
- * compiled into the kernel
- */
-#include <sys/kbio.h>
-#include <dev/kbd/kbdreg.h>
-
-static int dummy_kbd_configure(int flags);
-
-keyboard_switch_t bcmdummysw;
-
-static int
-dummy_kbd_configure(int flags)
-{
-
-	return (0);
-}
-KEYBOARD_DRIVER(bcmdummy, bcmdummysw, dummy_kbd_configure);

Modified: stable/12/sys/dev/terasic/mtl/terasic_mtl_syscons.c
==============================================================================
--- stable/12/sys/dev/terasic/mtl/terasic_mtl_syscons.c	Fri Dec 27 01:50:16 2019	(r356109)
+++ stable/12/sys/dev/terasic/mtl/terasic_mtl_syscons.c	Fri Dec 27 03:00:18 2019	(r356110)
@@ -406,22 +406,6 @@ terasic_mtl_vidsw_putm(video_adapter_t *adp, int x, in
 	return (ENODEV);
 }
 
-/*
- * XXXRW: For historical reasons, syscons can't register video consoles
- * without a keyboard implementation.  Provide a dummy.
- */
-static keyboard_switch_t	terasic_mtl_keyboard_switch;
-
-static int
-terasic_mtl_kbd_configure(int flags)
-{
-
-	return (0);
-}
-
-KEYBOARD_DRIVER(mtl_kbd, terasic_mtl_keyboard_switch,
-    terasic_mtl_kbd_configure);
-
 int
 terasic_mtl_syscons_attach(struct terasic_mtl_softc *sc)
 {

Modified: stable/12/sys/powerpc/ofw/ofw_syscons.c
==============================================================================
--- stable/12/sys/powerpc/ofw/ofw_syscons.c	Fri Dec 27 01:50:16 2019	(r356109)
+++ stable/12/sys/powerpc/ofw/ofw_syscons.c	Fri Dec 27 03:00:18 2019	(r356110)
@@ -1049,25 +1049,6 @@ static devclass_t	sc_devclass;
 DRIVER_MODULE(ofwfb, nexus, ofwfb_sc_driver, sc_devclass, 0, 0);
 
 /*
- * Define a stub keyboard driver in case one hasn't been
- * compiled into the kernel
- */
-#include <sys/kbio.h>
-#include <dev/kbd/kbdreg.h>
-
-static int dummy_kbd_configure(int flags);
-
-keyboard_switch_t dummysw;
-
-static int
-dummy_kbd_configure(int flags)
-{
-
-	return (0);
-}
-KEYBOARD_DRIVER(dummy, dummysw, dummy_kbd_configure);
-
-/*
  * Utility routines from <dev/fb/fbreg.h>
  */
 void