Module Name: src Committed By: flxd Date: Fri Nov 4 19:18:50 UTC 2016
Modified Files: src/etc/etc.pmax: Makefile.inc src/sys/arch/pmax/conf: files.pmax src/usr.sbin/sysinst/arch/pmax: md.h msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl Added Files: src/sys/arch/pmax/conf: GENERIC64_USB GENERIC_USB Log Message: Add new USB-enabled kernel config(s) based upon GENERIC for pmax, include it as kernel set in the build and make it a choice in sysinst. OK simonb@ To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/etc/etc.pmax/Makefile.inc cvs rdiff -u -r0 -r1.1 src/sys/arch/pmax/conf/GENERIC64_USB \ src/sys/arch/pmax/conf/GENERIC_USB cvs rdiff -u -r1.116 -r1.117 src/sys/arch/pmax/conf/files.pmax cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/pmax/md.h \ src/usr.sbin/sysinst/arch/pmax/msg.md.de \ src/usr.sbin/sysinst/arch/pmax/msg.md.en \ src/usr.sbin/sysinst/arch/pmax/msg.md.es \ src/usr.sbin/sysinst/arch/pmax/msg.md.fr \ src/usr.sbin/sysinst/arch/pmax/msg.md.pl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/etc/etc.pmax/Makefile.inc diff -u src/etc/etc.pmax/Makefile.inc:1.17 src/etc/etc.pmax/Makefile.inc:1.18 --- src/etc/etc.pmax/Makefile.inc:1.17 Mon Dec 14 01:12:05 2009 +++ src/etc/etc.pmax/Makefile.inc Fri Nov 4 19:18:50 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.17 2009/12/14 01:12:05 matt Exp $ +# $NetBSD: Makefile.inc,v 1.18 2016/11/04 19:18:50 flxd Exp $ # # etc.pmax/Makefile.inc -- pmax-specific etc Makefile targets # @@ -8,13 +8,13 @@ .if ${MACHINE_ARCH} == "mipsel" -KERNEL_SETS= GENERIC +KERNEL_SETS= GENERIC GENERIC_USB BUILD_KERNELS= INSTALL RAMDISK .else -KERNEL_SETS= GENERIC64 +KERNEL_SETS= GENERIC64 GENERIC64_USB BUILD_KERNELS= INSTALL64 RAMDISK64 Index: src/sys/arch/pmax/conf/files.pmax diff -u src/sys/arch/pmax/conf/files.pmax:1.116 src/sys/arch/pmax/conf/files.pmax:1.117 --- src/sys/arch/pmax/conf/files.pmax:1.116 Fri Oct 21 18:11:59 2016 +++ src/sys/arch/pmax/conf/files.pmax Fri Nov 4 19:18:50 2016 @@ -1,4 +1,4 @@ -# $NetBSD: files.pmax,v 1.116 2016/10/21 18:11:59 flxd Exp $ +# $NetBSD: files.pmax,v 1.117 2016/11/04 19:18:50 flxd Exp $ # DECstation-specific configuration info # maxpartitions must be first item in files.${ARCH}. @@ -178,4 +178,6 @@ file dev/tc/xcfb.c x # include "dev/usb/files.usb" +include "dev/bluetooth/files.bluetooth" + include "arch/pmax/conf/majors.pmax" Index: src/usr.sbin/sysinst/arch/pmax/md.h diff -u src/usr.sbin/sysinst/arch/pmax/md.h:1.1 src/usr.sbin/sysinst/arch/pmax/md.h:1.2 --- src/usr.sbin/sysinst/arch/pmax/md.h:1.1 Sat Jul 26 19:30:46 2014 +++ src/usr.sbin/sysinst/arch/pmax/md.h Fri Nov 4 19:18:50 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:46 dholland Exp $ */ +/* $NetBSD: md.h,v 1.2 2016/11/04 19:18:50 flxd Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -74,3 +74,4 @@ * base etc comp games man misc tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC" +#define SET_KERNEL_2_NAME "kern-GENERIC_USB" Index: src/usr.sbin/sysinst/arch/pmax/msg.md.de diff -u src/usr.sbin/sysinst/arch/pmax/msg.md.de:1.1 src/usr.sbin/sysinst/arch/pmax/msg.md.de:1.2 --- src/usr.sbin/sysinst/arch/pmax/msg.md.de:1.1 Sat Jul 26 19:30:46 2014 +++ src/usr.sbin/sysinst/arch/pmax/msg.md.de Fri Nov 4 19:18:50 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: msg.md.de,v 1.1 2014/07/26 19:30:46 dholland Exp $ */ +/* $NetBSD: msg.md.de,v 1.2 2016/11/04 19:18:50 flxd Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -50,3 +50,6 @@ message dobootblks message set_kernel_1 {Kernel (GENERIC)} + +message set_kernel_2 +{Kernel (GENERIC_USB)} Index: src/usr.sbin/sysinst/arch/pmax/msg.md.en diff -u src/usr.sbin/sysinst/arch/pmax/msg.md.en:1.1 src/usr.sbin/sysinst/arch/pmax/msg.md.en:1.2 --- src/usr.sbin/sysinst/arch/pmax/msg.md.en:1.1 Sat Jul 26 19:30:46 2014 +++ src/usr.sbin/sysinst/arch/pmax/msg.md.en Fri Nov 4 19:18:50 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: msg.md.en,v 1.1 2014/07/26 19:30:46 dholland Exp $ */ +/* $NetBSD: msg.md.en,v 1.2 2016/11/04 19:18:50 flxd Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -49,3 +49,6 @@ message dobootblks message set_kernel_1 {Kernel (GENERIC)} + +message set_kernel_2 +{Kernel (GENERIC_USB)} Index: src/usr.sbin/sysinst/arch/pmax/msg.md.es diff -u src/usr.sbin/sysinst/arch/pmax/msg.md.es:1.1 src/usr.sbin/sysinst/arch/pmax/msg.md.es:1.2 --- src/usr.sbin/sysinst/arch/pmax/msg.md.es:1.1 Sat Jul 26 19:30:46 2014 +++ src/usr.sbin/sysinst/arch/pmax/msg.md.es Fri Nov 4 19:18:50 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: msg.md.es,v 1.1 2014/07/26 19:30:46 dholland Exp $ */ +/* $NetBSD: msg.md.es,v 1.2 2016/11/04 19:18:50 flxd Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -49,3 +49,6 @@ message dobootblks message set_kernel_1 {Núcleo (GENERIC)} + +message set_kernel_2 +{Núcleo (GENERIC_USB)} Index: src/usr.sbin/sysinst/arch/pmax/msg.md.fr diff -u src/usr.sbin/sysinst/arch/pmax/msg.md.fr:1.1 src/usr.sbin/sysinst/arch/pmax/msg.md.fr:1.2 --- src/usr.sbin/sysinst/arch/pmax/msg.md.fr:1.1 Sat Jul 26 19:30:46 2014 +++ src/usr.sbin/sysinst/arch/pmax/msg.md.fr Fri Nov 4 19:18:50 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: msg.md.fr,v 1.1 2014/07/26 19:30:46 dholland Exp $ */ +/* $NetBSD: msg.md.fr,v 1.2 2016/11/04 19:18:50 flxd Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -50,3 +50,5 @@ message dobootblks message set_kernel_1 {Kernel (GENERIC)} +message set_kernel_2 +{Kernel (GENERIC_USB)} Index: src/usr.sbin/sysinst/arch/pmax/msg.md.pl diff -u src/usr.sbin/sysinst/arch/pmax/msg.md.pl:1.1 src/usr.sbin/sysinst/arch/pmax/msg.md.pl:1.2 --- src/usr.sbin/sysinst/arch/pmax/msg.md.pl:1.1 Sat Jul 26 19:30:46 2014 +++ src/usr.sbin/sysinst/arch/pmax/msg.md.pl Fri Nov 4 19:18:50 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: msg.md.pl,v 1.1 2014/07/26 19:30:46 dholland Exp $ */ +/* $NetBSD: msg.md.pl,v 1.2 2016/11/04 19:18:50 flxd Exp $ */ /* Based on english version: */ /* NetBSD: msg.md.en,v 1.8 2000/12/03 01:54:49 minoura Exp */ @@ -53,3 +53,5 @@ message dobootblks message set_kernel_1 {Kernel (GENERIC)} +message set_kernel_2 +{Kernel (GENERIC_USB)} Added files: Index: src/sys/arch/pmax/conf/GENERIC64_USB diff -u /dev/null src/sys/arch/pmax/conf/GENERIC64_USB:1.1 --- /dev/null Fri Nov 4 19:18:50 2016 +++ src/sys/arch/pmax/conf/GENERIC64_USB Fri Nov 4 19:18:50 2016 @@ -0,0 +1,16 @@ +# $NetBSD: GENERIC64_USB,v 1.1 2016/11/04 19:18:50 flxd Exp $ +# +# GENERIC64 kernel with USB + +include "arch/pmax/conf/GENERIC64" + +# TC-USB +tcu* at tc? slot ? offset ? +slhci* at tcu? +gpio* at gpiobus? + +# USB bus support +usb* at slhci? + +include "dev/usb/usbdevices.config" +midi* at midibus? Index: src/sys/arch/pmax/conf/GENERIC_USB diff -u /dev/null src/sys/arch/pmax/conf/GENERIC_USB:1.1 --- /dev/null Fri Nov 4 19:18:50 2016 +++ src/sys/arch/pmax/conf/GENERIC_USB Fri Nov 4 19:18:50 2016 @@ -0,0 +1,16 @@ +# $NetBSD: GENERIC_USB,v 1.1 2016/11/04 19:18:50 flxd Exp $ +# +# GENERIC kernel with USB + +include "arch/pmax/conf/GENERIC" + +# TC-USB +tcu* at tc? slot ? offset ? +slhci* at tcu? +gpio* at gpiobus? + +# USB bus support +usb* at slhci? + +include "dev/usb/usbdevices.config" +midi* at midibus?