diff options
| -rw-r--r-- | sys/conf/files.sparc64 | 13 | ||||
| -rw-r--r-- | sys/conf/options.sparc64 | 5 | ||||
| -rw-r--r-- | sys/sparc64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/sparc64/conf/NOTES | 4 |
4 files changed, 22 insertions, 4 deletions
diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64 index 50bc61f..0baea64 100644 --- a/sys/conf/files.sparc64 +++ b/sys/conf/files.sparc64 @@ -7,6 +7,11 @@ # limitations in config: backslash-newline doesn't work in strings, and # dependency lines other than the first are silently ignored. # +atkbdmap.h optional atkbd_dflt_keymap \ + compile-with "/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h" \ + no-obj no-implicit-rule before-depend \ + clean "atkbdmap.h" +# ukbdmap.h optional ukbd_dflt_keymap \ compile-with "/usr/sbin/kbdcontrol -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h" \ no-obj no-implicit-rule before-depend \ @@ -17,6 +22,13 @@ crypto/blowfish/bf_enc.c optional ipsec ipsec_esp crypto/des/des_enc.c optional ipsec ipsec_esp crypto/blowfish/bf_enc.c optional crypto crypto/des/des_enc.c optional crypto +dev/atkbdc/atkbd.c optional atkbd atkbdc +dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc +dev/atkbdc/atkbdc.c optional atkbdc +dev/atkbdc/atkbdc_ebus.c optional atkbdc ebus +dev/atkbdc/atkbdc_isa.c optional atkbdc isa +dev/atkbdc/atkbdc_subr.c optional atkbdc +dev/atkbdc/psm.c optional psm atkbdc dev/auxio/auxio.c optional auxio sbus dev/auxio/auxio.c optional auxio ebus dev/esp/esp_sbus.c optional esp sbus @@ -25,6 +37,7 @@ dev/fb/fb.c optional sc dev/fb/machfb.c optional machfb sc dev/fb/splash.c optional splash dev/hwpmc/hwpmc_sparc64.c optional hwpmc +dev/kbd/kbd.c optional atkbd dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd dev/ofw/ofw_bus_if.m standard diff --git a/sys/conf/options.sparc64 b/sys/conf/options.sparc64 index 3c7f9ff..3944ceb 100644 --- a/sys/conf/options.sparc64 +++ b/sys/conf/options.sparc64 @@ -13,3 +13,8 @@ OFWCONS_POLL_HZ opt_ofw.h # Debug IOMMU inserts/removes using diagnostic accesses. Very loud. IOMMU_DIAG opt_iommu.h PMAP_STATS opt_pmap.h + +ATKBD_DFLT_KEYMAP opt_atkbd.h +PSM_DEBUG opt_psm.h +PSM_HOOKRESUME opt_psm.h +PSM_RESETAFTERSUSPEND opt_psm.h diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index d133ab6..1e00fe7c 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -116,6 +116,10 @@ device ses # SCSI Environmental Services (and SAF-TE) #device amr # AMI MegaRAID #device mlx # Mylex DAC960 family +# atkbdc0 controls both the keyboard and the PS/2 mouse +#device atkbdc # AT keyboard controller +#device atkbd # AT keyboard +#device psm # PS/2 mouse # syscons is the default console driver, resembling an SCO console #device sc diff --git a/sys/sparc64/conf/NOTES b/sys/sparc64/conf/NOTES index 20820af..fa34268 100644 --- a/sys/sparc64/conf/NOTES +++ b/sys/sparc64/conf/NOTES @@ -63,10 +63,6 @@ device sab # Siemens SAB82532 based serial ports ##################################################################### # Devices we don't want to deal with -nodevice ukbd -nodevice atkbdc -nodevice atkbd -nodevice psm nodevice vga nodevice daemon_saver nodevice snake_saver |
