d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Hook up atkbdc(4), atkbd(4) and psm(4) to the sparc64 build, not

Browse Source 
enabled in GENERIC by default, yet.
- While here remove the exclusion of ukbd(4) from the sparc64 NOTES
  as ukbd(4) compiles and works on sparc64.
This commit is contained in:
marius 2005-06-10 20:58:59 +00:00
parent 9afc57a1d6
commit 7958cd2c90
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/conf/files.sparc64
View File

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

5
sys/conf/options.sparc64
View File

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

4
sys/sparc64/conf/GENERIC
View File

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

4
sys/sparc64/conf/NOTES
View File

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