svn commit: r355936 - in head/sys: arm/broadcom/bcm2835 arm/freescale/imx arm/ti/am335x arm/versatile powerpc/ofw

[Kyle Evans]

Author: kevans
Date: Fri Dec 20 16:22:14 2019
New Revision: 355936
URL: https://svnweb.freebsd.org/changeset/base/355936

Log:
  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.
  
  MFC after:	1 week

Modified:
  head/sys/arm/broadcom/bcm2835/bcm2835_fb.c
  head/sys/arm/freescale/imx/imx51_ipuv3.c
  head/sys/arm/ti/am335x/am335x_lcd_syscons.c
  head/sys/arm/versatile/versatile_clcd.c
  head/sys/powerpc/ofw/ofw_syscons.c

Modified: head/sys/arm/broadcom/bcm2835/bcm2835_fb.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_fb.c	Fri Dec 20 16:20:38 2019	(r355935)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_fb.c	Fri Dec 20 16:22:14 2019	(r355936)
@@ -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: head/sys/arm/freescale/imx/imx51_ipuv3.c
==============================================================================
--- head/sys/arm/freescale/imx/imx51_ipuv3.c	Fri Dec 20 16:20:38 2019	(r355935)
+++ head/sys/arm/freescale/imx/imx51_ipuv3.c	Fri Dec 20 16:22:14 2019	(r355936)
@@ -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: head/sys/arm/ti/am335x/am335x_lcd_syscons.c
==============================================================================
--- head/sys/arm/ti/am335x/am335x_lcd_syscons.c	Fri Dec 20 16:20:38 2019	(r355935)
+++ head/sys/arm/ti/am335x/am335x_lcd_syscons.c	Fri Dec 20 16:22:14 2019	(r355936)
@@ -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: head/sys/arm/versatile/versatile_clcd.c
==============================================================================
--- head/sys/arm/versatile/versatile_clcd.c	Fri Dec 20 16:20:38 2019	(r355935)
+++ head/sys/arm/versatile/versatile_clcd.c	Fri Dec 20 16:22:14 2019	(r355936)
@@ -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: head/sys/powerpc/ofw/ofw_syscons.c
==============================================================================
--- head/sys/powerpc/ofw/ofw_syscons.c	Fri Dec 20 16:20:38 2019	(r355935)
+++ head/sys/powerpc/ofw/ofw_syscons.c	Fri Dec 20 16:22:14 2019	(r355936)
@@ -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