aboutsummaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files.alpha10
-rw-r--r--sys/conf/files.i38614
-rw-r--r--sys/conf/options.alpha6
-rw-r--r--sys/conf/options.i3866
4 files changed, 29 insertions, 7 deletions
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index 104ab353244c..6f747e3ff115 100644
--- a/sys/conf/files.alpha
+++ b/sys/conf/files.alpha
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $Id: files.alpha,v 1.15 1999/01/18 20:26:50 gallatin Exp $
+# $Id: files.alpha,v 1.16 1999/01/23 16:53:26 dfr Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -12,7 +12,11 @@ font8x16.o optional std8x16font \
compile-with "uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c" \
no-implicit-rule before-depend \
clean "${STD8X16FONT}-8x16 font8x16.c"
-
+#
+atkbdmap.h optional atkbd_dflt_keymap \
+ compile-with "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"
#
alpha/alpha/autoconf.c standard device-driver
alpha/alpha/cpuconf.c standard
@@ -148,7 +152,7 @@ dev/kbd/atkbdc.c optional atkbdc device-driver
isa/atkbdc_isa.c optional atkbdc device-driver
dev/kbd/kbd.c optional atkbd device-driver
dev/kbd/kbd.c optional kbd device-driver
-#dev/kbd/kbd.c optional ukbd device-driver
+dev/kbd/kbd.c optional ukbd device-driver
dev/syscons/syscons.c optional sc device-driver
dev/syscons/scvidctl.c optional sc device-driver
isa/syscons_isa.c optional sc device-driver
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 2e91b0bcedef..3fe59ba519a0 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $Id: files.i386,v 1.226 1999/03/07 16:11:12 hm Exp $
+# $Id: files.i386,v 1.227 1999/03/10 10:11:41 julian Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -24,6 +24,16 @@ font8x16.o optional std8x16font \
no-implicit-rule before-depend \
clean "${STD8X16FONT}-8x16 font8x16.c"
#
+atkbdmap.h optional atkbd_dflt_keymap \
+ compile-with "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 "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 \
+ clean "ukbdmap.h"
+#
dev/ata/ata-all.c optional ata device-driver
dev/ata/atapi-all.c optional ata device-driver
dev/ata/ata-disk.c optional atadisk device-driver
@@ -37,7 +47,7 @@ dev/kbd/atkbd.c optional atkbd device-driver
dev/kbd/atkbdc.c optional atkbdc device-driver
dev/kbd/kbd.c optional atkbd device-driver
dev/kbd/kbd.c optional kbd device-driver
-#dev/kbd/kbd.c optional ukbd device-driver
+dev/kbd/kbd.c optional ukbd device-driver
dev/syscons/syscons.c optional sc device-driver
dev/syscons/scvidctl.c optional sc device-driver
dev/syscons/scvesactl.c optional sc device-driver
diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha
index e6b7f1376961..2da70be12480 100644
--- a/sys/conf/options.alpha
+++ b/sys/conf/options.alpha
@@ -1,4 +1,4 @@
-# $Id: options.alpha,v 1.8 1999/01/18 20:26:50 gallatin Exp $
+# $Id: options.alpha,v 1.9 1999/01/23 16:53:26 dfr Exp $
EV5 opt_global.h
EV4 opt_global.h
@@ -41,7 +41,11 @@ PSM_DEBUG opt_psm.h
# Fb options
FB_INSTALL_CDEV opt_fb.h
+# Atkbd options
+ATKBD_DFLT_KEYMAP opt_atkbd.h
+
# Kbd options
+KBD_DISABLE_KEYMAP_LOAD opt_kbd.h
KBD_INSTALL_CDEV opt_kbd.h
KBD_MAXRETRY opt_kbd.h
KBD_MAXWAIT opt_kbd.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 77ab8bbfcf9e..ee6cf78417bf 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-# $Id: options.i386,v 1.107 1999/03/09 20:20:02 phk Exp $
+# $Id: options.i386,v 1.108 1999/03/10 10:11:42 julian Exp $
DISABLE_PSE
IDE_DELAY
@@ -89,6 +89,10 @@ PSM_DEBUG opt_psm.h
PCIC_RESUME_RESET opt_pcic.h
+ATKBD_DFLT_KEYMAP opt_atkbd.h
+UKBD_DFLT_KEYMAP opt_ukbd.h
+
+KBD_DISABLE_KEYMAP_LOAD opt_kbd.h
KBD_INSTALL_CDEV opt_kbd.h
KBD_MAXRETRY opt_kbd.h
KBD_MAXWAIT opt_kbd.h