From 96a1eea028701014b789b6f96d4e3c9e5ec826b1 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Thu, 23 Jul 2015 22:39:06 +0200 Subject: [PATCH] i386 removal, part 21/x: Remove obsolete i386 specific USERCONFIG bits. Even though some of this code was copied over to x86_64, this platform never had the kernel support. --- Makefile_upgrade.inc | 2 + sbin/Makefile | 5 +- sbin/kget/Makefile | 7 -- sbin/kget/kget.8 | 64 ---------------- sbin/kget/kget.c | 121 ------------------------------- sbin/reboot/boot_pc64.8 | 10 +-- share/man/man5/Makefile | 1 - share/man/man5/kernel.conf.5 | 99 ------------------------- share/man/man5/loader.conf.5 | 5 -- sys/boot/common/help.common | 1 - sys/boot/common/isapnp.h | 11 +-- sys/boot/common/loader.8 | 14 +--- sys/boot/dloader/cmds.c | 1 - sys/boot/dloader/dloader.menu | 1 - sys/boot/dloader/loader-bootp.conf | 5 -- sys/boot/dloader/loader.conf | 5 -- sys/boot/pc32/libi386/bootinfo.c | 5 -- sys/boot/pc32/loader/help.i386 | 8 -- sys/bus/isa/pnp.c | 74 ------------------- sys/bus/isa/pnpreg.h | 9 --- sys/config/LINT64 | 4 - sys/dev/misc/syscons/syscons.c | 2 +- sys/dev/video/fb/vga.c | 5 +- sys/kern/tty_cons.c | 3 +- sys/platform/pc64/x86_64/machdep.c | 6 -- sys/platform/vkernel64/x86_64/autoconf.c | 4 - sys/sys/reboot.h | 3 +- 27 files changed, 11 insertions(+), 464 deletions(-) delete mode 100644 sbin/kget/Makefile delete mode 100644 sbin/kget/kget.8 delete mode 100644 sbin/kget/kget.c delete mode 100644 share/man/man5/kernel.conf.5 diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 076b5722ab..5eb76daa9f 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -2154,6 +2154,8 @@ TO_REMOVE+=/usr/share/nls/no_NO.ISO8859-1 TO_REMOVE+=/usr/share/nls/mn_MN.UTF-8 TO_REMOVE+=/usr/share/nls/zh_CN.* TO_REMOVE+=/usr/share/nls/zh_hans_CN.* +TO_REMOVE+=/usr/share/man/man8/boot_pc32.8.gz +TO_REMOVE+=/usr/share/man/man5/kernel.conf.5.gz .if ${MACHINE_ARCH} == "x86_64" TO_REMOVE+=/usr/sbin/stlstats diff --git a/sbin/Makefile b/sbin/Makefile index be093deee7..458fef8906 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -101,10 +101,7 @@ SUBDIR= adjkerntz \ vinum \ vquota -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" -.if ${MACHINE_ARCH} == "i386" -SUBDIR+=kget -.endif +.if ${MACHINE_ARCH} == "x86_64" SUBDIR+=mount_smbfs \ fdisk \ nextboot diff --git a/sbin/kget/Makefile b/sbin/kget/Makefile deleted file mode 100644 index 3dfcb658c7..0000000000 --- a/sbin/kget/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD: src/sbin/kget/Makefile,v 1.3.2.2 2001/04/25 10:58:28 ru Exp $ -# $DragonFly: src/sbin/kget/Makefile,v 1.4 2006/10/17 00:55:41 pavalos Exp $ -# -PROG= kget -MAN= kget.8 - -.include diff --git a/sbin/kget/kget.8 b/sbin/kget/kget.8 deleted file mode 100644 index 461cf5ebcf..0000000000 --- a/sbin/kget/kget.8 +++ /dev/null @@ -1,64 +0,0 @@ -.\" Copyright (c) 1999 Andrzej Bialecki -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $FreeBSD: src/sbin/kget/kget.8,v 1.3.2.5 2001/08/16 11:35:45 ru Exp $ -.\" -.Dd February 20, 1999 -.Dt KGET 8 -.Os -.Sh NAME -.Nm kget -.Nd "print kernel change information" -.Sh SYNOPSIS -.Nm -.Ar filename -.Sh DESCRIPTION -The -.Nm -utility allows one to view or save any device configuration information -which was changed in a userconfig (-c) session. -.Pp -The -.Ar filename -argument specifies which file (or -.Sq - -for stdout) the information should be saved to. -If the file exists, it will be overwritten. -.Pp -Most typically, the information is written to a -.Pa /boot/kernel.conf -file which is then loaded from -.Pa /boot/loader.rc -(using -.Dq "load -t userconfig_script /boot/kernel.conf" ) , -saving the user from having to re-enter it each time the system is booted. -.Sh HISTORY -The -.Nm -command appeared in -.Fx 3.1 , -as part of the PicoBSD distribution by -.An Andrzej Bialecki -.Sh BUGS -Sure to be some. diff --git a/sbin/kget/kget.c b/sbin/kget/kget.c deleted file mode 100644 index 80389ecb67..0000000000 --- a/sbin/kget/kget.c +++ /dev/null @@ -1,121 +0,0 @@ -/*- - * Copyright (c) 1999 Andrzej Bialecki - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD: src/sbin/kget/kget.c,v 1.4.2.2 2001/08/01 08:19:51 obrien Exp $ - * $DragonFly: src/sbin/kget/kget.c,v 1.6 2008/06/05 18:06:30 swildner Exp $ - */ - -#include -#include -#include -#include -#include -#include - -struct uc_device *id; -char *p; - -int -main(int argc, char *argv[]) -{ - int err; - size_t i, len; - char *buf; - const char *mib1="machdep.uc_devlist"; - char name[9]; - FILE *fout; - - if(argc<2) { - fout=stdout; - } else { - if(strcmp(argv[1],"-")==0) { - fout=stdout; - } else { - fout=fopen(argv[1],"w"); - if(fout==NULL) { - perror("opening output file"); - exit(1); - } - } - } - - /* We use sysctlbyname, because the oid is unknown (OID_AUTO) */ - - /* Print the changes made to ISA devices */ - /* get the buffer size */ - err=sysctlbyname(mib1,NULL,&len,NULL,0); - if(err) { - perror("buffer sizing"); - exit(-1); - } - buf=malloc(len*sizeof(char)); - if (buf==NULL) { - perror("malloc"); - exit(-1); - } - err=sysctlbyname(mib1,buf,&len,NULL,0); - if(err) { - perror("retrieving data"); - exit(-1); - } - i=0; - while(iid_enabled) { - fprintf(fout,"disable %s%d\n",name,id->id_unit); - } else { - fprintf(fout,"enable %s%d\n",name,id->id_unit); - if(id->id_iobase>0) { - fprintf(fout,"port %s%d %#x\n",name,id->id_unit, - id->id_iobase); - } - if(id->id_irq>0) { - fprintf(fout,"irq %s%d %d\n",name,id->id_unit, - ffs(id->id_irq)-1); - } - if(id->id_drq>0) { - fprintf(fout,"drq %s%d %d\n",name,id->id_unit, - id->id_drq); - } - if (id->id_maddr != NULL) { - fprintf(fout,"iomem %s%d %p\n",name,id->id_unit, - id->id_maddr); - } - if(id->id_msize>0) { - fprintf(fout,"iosize %s%d %d\n",name,id->id_unit, - id->id_msize); - } - fprintf(fout,"flags %s%d %#x\n",name,id->id_unit, - id->id_flags); - } - i+=sizeof(struct uc_device)+8; - } - free(buf); - fprintf(fout,"quit\n"); - fclose(fout); - exit(0); -} diff --git a/sbin/reboot/boot_pc64.8 b/sbin/reboot/boot_pc64.8 index cef51fee5d..7522539d0a 100644 --- a/sbin/reboot/boot_pc64.8 +++ b/sbin/reboot/boot_pc64.8 @@ -36,7 +36,7 @@ .\" .\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.23.2.11 2002/04/24 17:47:58 rnordier Exp $ .\" -.Dd September 2, 2008 +.Dd July 23, 2015 .Dt BOOT 8 .Os .Sh NAME @@ -168,14 +168,6 @@ during kernel initialization, ask for the device to mount as the root file system. .It Fl C boot from CDROM. -.It Fl c -run UserConfig to modify hardware parameters for the loaded -kernel. If the kernel was built with one of -.Dv USERCONFIG , INTRO_USERCONFIG , VISUAL_USERCONFIG -options, -remain in UserConfig regardless of any -.Ic quit -commands present in the script. .It Fl D Use all available consoles as the system console. Input will be accepted on any console and output will be routed to all of them. This is the diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index 30bc689648..ad8b1595dd 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -28,7 +28,6 @@ MAN= acct.5 \ intro.5 \ libmap.conf.5 \ kernconf.5 \ - kernel.conf.5 \ link.5 \ linprocfs.5 \ loader.conf.5 \ diff --git a/share/man/man5/kernel.conf.5 b/share/man/man5/kernel.conf.5 deleted file mode 100644 index 87c7c232fc..0000000000 --- a/share/man/man5/kernel.conf.5 +++ /dev/null @@ -1,99 +0,0 @@ -.\" -.\" Copyright (c) 2003 Bruce M Simpson -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $FreeBSD: src/share/man/man5/kernel.conf.5,v 1.1.2.2 2003/05/24 20:45:28 hmp Exp $ -.\" -.Dd May 23, 2003 -.Dt KERNEL.CONF 5 -.Os -.Sh NAME -.Nm kernel.conf -.Nd configuration for legacy devices -.Sh DESCRIPTION -The -.Nm -file contains configuration entries created by the USERCONFIG mechanism. -This is typically used to force I/O port, memory and IRQ settings for -legacy ISA devices on the i386 platform. -It is typically created during first-time system installation by -.Xr kget 8 . -.Pp -The file -.Pa /boot/loader.conf -must contain this line for the -.Nm -script to be loaded: -.Pp -.Dl userconfig_script_load="YES" -.Pp -The file -.Pa /boot/defaults/loader.conf -contains the following two lines: -.Pp -.Dl userconfig_script_name="/boot/kernel.conf" -.Dl userconfig_script_type="userconfig_script" -.Pp -The kernel must be compiled with the following option: -.Pp -.D1 Cd options USERCONFIG -.Pp -This option is normally present in the GENERIC kernel. -.Sh SYNTAX -Device names must contain both the name of the driver and the instance -number, for example, ed0. -.Pp -.Bl -tag -width "iom
" -compact -.It Sy di -Disable the given device. -.It Sy en -Enable the given device. -.It Sy po -Set the beginning of the device's allocated port range. -.It Sy ir -Set the device's interrupt request line. -.It Sy dr -Set the device's dma channel. -.It Sy iom
-Set the beginning of the device's allocated memory window. -.It Sy ios -Set the size of the device's allocated memory window. -.It Sy f -Set arbitrary flags for the device. -.It Sy q -End the configuration file. -.El -.Sh SEE ALSO -.Xr loader.conf 5 -.Xr boot 8 , -.Xr kget 8 , -.Xr loader 8 -.Sh HISTORY -The -.Nm -mechanism has been deprecated in -.Fx 5.0 . -.Sh AUTHORS -This man page was written by -.An Bruce M Simpson Aq Mt bms@spc.org . diff --git a/share/man/man5/loader.conf.5 b/share/man/man5/loader.conf.5 index 3659e0b863..738a80ed27 100644 --- a/share/man/man5/loader.conf.5 +++ b/share/man/man5/loader.conf.5 @@ -265,11 +265,6 @@ If set to .Dq YES , will load the splash screen module, making it possible to display a pcx image on the screen while booting. -.It Va userconfig_script_load -.Pq Dq NO -If set to -.Dq YES , -will load the userconfig data. .It Va vesa_load .Pq Dq NO If set to diff --git a/sys/boot/common/help.common b/sys/boot/common/help.common index e01b5e49e8..9869cbee27 100644 --- a/sys/boot/common/help.common +++ b/sys/boot/common/help.common @@ -124,7 +124,6 @@ -a Same as `set boot_askname' -C Same as `set boot_cdrom' - -c Same as `set boot_userconfig' -d Same as `set boot_ddb' -g Same as `set boot_gdb' -h Same as `set boot_serial' diff --git a/sys/boot/common/isapnp.h b/sys/boot/common/isapnp.h index 39ca81bad5..01502e4668 100644 --- a/sys/boot/common/isapnp.h +++ b/sys/boot/common/isapnp.h @@ -37,11 +37,6 @@ /* Maximum Number of PnP Devices. 8 should be plenty */ #define MAX_PNP_CARDS 8 -/* - * the following is the maximum number of PnP Logical devices that - * userconfig can handle. - */ -#define MAX_PNP_LDN 20 /* Static ports to access PnP state machine */ #ifndef _KERNEL @@ -238,9 +233,7 @@ /* * pnp_cinfo contains Configuration Information. They are used * to communicate to the device driver the actual configuration - * of the device, and also by the userconfig menu to let the - * operating system override any configuration set by the bios. - * + * of the device. */ struct pnp_cinfo { u_int vendor_id; /* board id */ @@ -249,7 +242,6 @@ struct pnp_cinfo { u_char csn; /* assigned Card Select Number */ u_char ldn; /* Logical Device Number */ u_char enable; /* pnp enable */ - u_char override; /* override bios parms (in userconfig) */ u_char irq[2]; /* IRQ Number */ u_char irq_type[2]; /* IRQ Type */ u_char drq[2]; @@ -286,7 +278,6 @@ struct pnp_dlist_node { typedef struct _pnp_id pnp_id; extern pnp_id pnp_devices[MAX_PNP_CARDS]; -extern struct pnp_cinfo pnp_ldn_overrides[MAX_PNP_LDN]; /* * these two functions are for use in drivers diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8 index 524ca87ded..78db15ea7a 100644 --- a/sys/boot/common/loader.8 +++ b/sys/boot/common/loader.8 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD: src/sys/boot/common/loader.8,v 1.57 2003/06/29 20:57:55 brueffer Exp $ .\" -.Dd November 12, 2014 +.Dd July 23, 2015 .Dt LOADER 8 .Os .Sh NAME @@ -487,9 +487,6 @@ Selects gdb-remote mode for the kernel debugger by default. .It Va boot_single Prevents the kernel from initiating a multi-user startup; instead single-user mode will be entered when the kernel has finished device probing. -.It Va boot_userconfig -Requests that the kernel's interactive device configuration program -be run when the kernel is booted. .It Va boot_verbose Setting this variable causes extra debugging information to be printed by the kernel during and after the boot phase. @@ -819,15 +816,6 @@ Boot in single user mode: .Dl loadall .Dl boot -s .Pp -Load kernel's user configuration file. -Notice that a kernel must be loaded before any other -.Ic load -command is attempted. -.Bd -literal -offset indent -load kernel -load -t userconfig_script kernel.conf -.Ed -.Pp Load the kernel, a splash screen, and then autoboot in five seconds. .Bd -literal -offset indent load kernel diff --git a/sys/boot/dloader/cmds.c b/sys/boot/dloader/cmds.c index 4edeb568ce..16ea658001 100644 --- a/sys/boot/dloader/cmds.c +++ b/sys/boot/dloader/cmds.c @@ -74,7 +74,6 @@ static char *kenv_vars[] = { "boot_gdb", "boot_serial", "boot_single", - "boot_userconfig", "boot_verbose", "boot_vidcons", "bootfile", diff --git a/sys/boot/dloader/dloader.menu b/sys/boot/dloader/dloader.menu index 9c768fb5cb..60066f995c 100644 --- a/sys/boot/dloader/dloader.menu +++ b/sys/boot/dloader/dloader.menu @@ -7,7 +7,6 @@ unload unset boot_askname unset boot_cdrom -unset boot_userconfig unset boot_ddb unset boot_gdb unset boot_single diff --git a/sys/boot/dloader/loader-bootp.conf b/sys/boot/dloader/loader-bootp.conf index e80abbcb73..9ea55afe7a 100644 --- a/sys/boot/dloader/loader-bootp.conf +++ b/sys/boot/dloader/loader-bootp.conf @@ -17,10 +17,6 @@ kernel="kernel.BOOTP" bootfile="kernel.BOOTP" # Kernel name (possibly absolute path) kernel_options="" -userconfig_script_load="NO" -userconfig_script_name="/boot/kernel-bootp.conf" -userconfig_script_type="userconfig_script" - ############################################################## ### Splash screen configuration ############################ @@ -60,7 +56,6 @@ module_path=";modules" # Set the module search path #boot_ddb="" # Instructs the kernel to start in the DDB debugger #boot_gdb="" # Selects gdb-remote mode for the kernel debugger #boot_single="" # Start system in single-user mode -#boot_userconfig="" # Run kernel's interactive device configuration program #boot_verbose="" # Causes extra debugging information to be printed #init_path="/sbin/init:/sbin/oinit:/sbin/init.bak" # Sets the list of init candidates diff --git a/sys/boot/dloader/loader.conf b/sys/boot/dloader/loader.conf index 2bea7ed70e..a870586ec1 100644 --- a/sys/boot/dloader/loader.conf +++ b/sys/boot/dloader/loader.conf @@ -18,10 +18,6 @@ kernel="kernel" bootfile="kernel" # Kernel name (possibly absolute path) kernel_options="" -userconfig_script_load="NO" -userconfig_script_name="/boot/kernel.conf" -userconfig_script_type="userconfig_script" - ############################################################## ### Splash screen configuration ############################ @@ -63,7 +59,6 @@ bitmap_type="splash_image_data" # and place it on the module_path #boot_ddb="" # Instructs the kernel to start in the DDB debugger #boot_gdb="" # Selects gdb-remote mode for the kernel debugger #boot_single="" # Start system in single-user mode -#boot_userconfig="" # Run kernel's interactive device configuration program #boot_verbose="" # Causes extra debugging information to be printed #init_path="/sbin/init:/sbin/oinit:/sbin/init.bak" # Sets the list of init candidates diff --git a/sys/boot/pc32/libi386/bootinfo.c b/sys/boot/pc32/libi386/bootinfo.c index 4dca7ff24f..8c4711c2c1 100644 --- a/sys/boot/pc32/libi386/bootinfo.c +++ b/sys/boot/pc32/libi386/bootinfo.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.35 2003/08/25 23:28:31 obrien Exp $ - * $DragonFly: src/sys/boot/pc32/libi386/bootinfo.c,v 1.4 2004/06/25 05:37:58 dillon Exp $ */ #include @@ -46,7 +45,6 @@ static struct } howto_names[] = { {"boot_askname", RB_ASKNAME}, {"boot_cdrom", RB_CDROM}, - {"boot_userconfig", RB_CONFIG}, {"boot_ddb", RB_KDB}, {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, @@ -77,9 +75,6 @@ bi_getboothowto(char *kargs) case 'a': howto |= RB_ASKNAME; break; - case 'c': - howto |= RB_CONFIG; - break; case 'C': howto |= RB_CDROM; break; diff --git a/sys/boot/pc32/loader/help.i386 b/sys/boot/pc32/loader/help.i386 index 18736e1d79..d629582f1f 100644 --- a/sys/boot/pc32/loader/help.i386 +++ b/sys/boot/pc32/loader/help.i386 @@ -55,14 +55,6 @@ correctly locate the SCSI disk you are booting from. ################################################################################ -# Tset Sboot_userconfig DStart Userconfig - - set boot_userconfig - - Requests that the kernel's interactive device configuration program - be run when the kernel is booted. - -################################################################################ # Tset Sroot_disk_unit DForce the root disk unit number. set root_disk_unit= diff --git a/sys/bus/isa/pnp.c b/sys/bus/isa/pnp.c index b8b3cce562..1c2a04817f 100644 --- a/sys/bus/isa/pnp.c +++ b/sys/bus/isa/pnp.c @@ -98,19 +98,6 @@ struct pnp_quirk pnp_quirks[] = { { 0 } }; -#if 0 -/* - * these entries are initialized using the autoconfig menu - * The struct is invalid (and must be initialized) if the first - * CSN is zero. The init code fills invalid entries with CSN 255 - * which is not a supported value. - */ - -struct pnp_cinfo pnp_ldn_overrides[MAX_PNP_LDN] = { - { 0 } -}; -#endif - /* The READ_DATA port that we are using currently */ static int pnp_rd_port; @@ -241,67 +228,6 @@ pnp_get_resource_info(u_char *buffer, int len) return count; } -#if 0 -/* - * write_pnp_parms initializes a logical device with the parms - * in d, and then activates the board if the last parameter is 1. - */ - -static int -write_pnp_parms(struct pnp_cinfo *d, pnp_id *p, int ldn) -{ - int i, empty = -1 ; - - pnp_write (SET_LDN, ldn ); - i = pnp_read(SET_LDN) ; - if (i != ldn) { - kprintf("Warning: LDN %d does not exist\n", ldn); - } - for (i = 0; i < 8; i++) { - pnp_write(IO_CONFIG_BASE + i * 2, d->ic_port[i] >> 8 ); - pnp_write(IO_CONFIG_BASE + i * 2 + 1, d->ic_port[i] & 0xff ); - } - for (i = 0; i < 4; i++) { - pnp_write(MEM_CONFIG + i*8, (d->ic_mem[i].base >> 16) & 0xff ); - pnp_write(MEM_CONFIG + i*8+1, (d->ic_mem[i].base >> 8) & 0xff ); - pnp_write(MEM_CONFIG + i*8+2, d->ic_mem[i].control & 0xff ); - pnp_write(MEM_CONFIG + i*8+3, (d->ic_mem[i].range >> 16) & 0xff ); - pnp_write(MEM_CONFIG + i*8+4, (d->ic_mem[i].range >> 8) & 0xff ); - } - for (i = 0; i < 2; i++) { - pnp_write(IRQ_CONFIG + i*2 , d->irq[i] ); - pnp_write(IRQ_CONFIG + i*2 + 1, d->irq_type[i] ); - pnp_write(DRQ_CONFIG + i, d->drq[i] ); - } - /* - * store parameters read into the current kernel - * so manual editing next time is easier - */ - for (i = 0 ; i < MAX_PNP_LDN; i++) { - if (pnp_ldn_overrides[i].csn == d->csn && - pnp_ldn_overrides[i].ldn == ldn) { - d->flags = pnp_ldn_overrides[i].flags ; - pnp_ldn_overrides[i] = *d ; - break ; - } else if (pnp_ldn_overrides[i].csn < 1 || - pnp_ldn_overrides[i].csn == 255) - empty = i ; - } - if (i== MAX_PNP_LDN && empty != -1) - pnp_ldn_overrides[empty] = *d; - - /* - * Here should really perform the range check, and - * return a failure if not successful. - */ - pnp_write (IO_RANGE_CHECK, 0); - DELAY(1000); /* XXX is it really necessary ? */ - pnp_write (ACTIVATE, d->enable ? 1 : 0); - DELAY(1000); /* XXX is it really necessary ? */ - return 1 ; -} -#endif - /* * This function is called after the bus has assigned resource * locations for a logical device. diff --git a/sys/bus/isa/pnpreg.h b/sys/bus/isa/pnpreg.h index d10107e07e..ad0d7a606f 100644 --- a/sys/bus/isa/pnpreg.h +++ b/sys/bus/isa/pnpreg.h @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/isa/pnpreg.h,v 1.3.2.1 2000/05/11 11:10:35 nyan Exp $ - * $DragonFly: src/sys/bus/isa/pnpreg.h,v 1.3 2005/06/12 20:55:14 swildner Exp $ * from: pnp.h,v 1.7 1998/09/13 22:15:44 eivind Exp */ @@ -40,14 +39,6 @@ /* Maximum Number of PnP Devices. 8 should be plenty */ #define PNP_MAX_CARDS 8 -#if 0 -/* - * the following is the maximum number of PnP Logical devices that - * userconfig can handle. - */ -#define MAX_PNP_LDN 20 -#endif - /* Static ports to access PnP state machine */ #define _PNP_ADDRESS 0x279 #define _PNP_WRITE_DATA 0xa79 diff --git a/sys/config/LINT64 b/sys/config/LINT64 index 82d08f92d9..cdf6e9b8e7 100644 --- a/sys/config/LINT64 +++ b/sys/config/LINT64 @@ -1087,10 +1087,6 @@ device sio0 at isa? port IO_COM1 flags 0x10 irq 4 # access the device in any normal way. # 0x80 use this port for serial line gdb support in ddb. # -# PnP `flags' (set via userconfig using pnp x flags y) -# 0x1 disable probing of this device. Used to prevent your modem -# from being attached as a PnP modem. -# # Options for serial drivers that support consoles (only for sio now): options BREAK_TO_DEBUGGER #a BREAK on a comconsole goes to diff --git a/sys/dev/misc/syscons/syscons.c b/sys/dev/misc/syscons/syscons.c index 077da0fe80..0c567facb7 100644 --- a/sys/dev/misc/syscons/syscons.c +++ b/sys/dev/misc/syscons/syscons.c @@ -2235,7 +2235,7 @@ scsplash_callback(int event, void *arg) if (add_scrn_saver(scsplash_saver) == 0) { sc->flags &= ~SC_SAVER_FAILED; run_scrn_saver = TRUE; - if (cold && !(boothowto & (RB_VERBOSE | RB_CONFIG))) { + if (cold) { scsplash_stick(TRUE); (*current_saver)(sc, TRUE); } diff --git a/sys/dev/video/fb/vga.c b/sys/dev/video/fb/vga.c index a0e5035e15..a1bae19d53 100644 --- a/sys/dev/video/fb/vga.c +++ b/sys/dev/video/fb/vga.c @@ -645,9 +645,8 @@ probe_adapters(void) #endif /* - * Ensure a zero start address. This is mainly to recover after - * switching from pcvt using userconfig(). The registers are w/o - * for old hardware so it's too hard to relocate the active screen + * Ensure a zero start address. The registers are w/o for old + * hardware so it's too hard to relocate the active screen * memory. * This must be done before vga_save_state() for VGA. */ diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c index f2bb87d34b..149d056abd 100644 --- a/sys/kern/tty_cons.c +++ b/sys/kern/tty_cons.c @@ -159,8 +159,7 @@ cninit(void) cn_mute = ((boothowto & (RB_MUTE |RB_SINGLE |RB_VERBOSE - |RB_ASKNAME - |RB_CONFIG)) == RB_MUTE); + |RB_ASKNAME)) == RB_MUTE); /* * Find the first console with the highest priority. diff --git a/sys/platform/pc64/x86_64/machdep.c b/sys/platform/pc64/x86_64/machdep.c index 40659abe03..a7224325d0 100644 --- a/sys/platform/pc64/x86_64/machdep.c +++ b/sys/platform/pc64/x86_64/machdep.c @@ -475,12 +475,6 @@ again: kmem_suballoc(&clean_map, &pager_map, &pager_sva, &pager_eva, ((vm_offset_t)nswbuf * MAXPHYS) + pager_map_size); pager_map.system_map = 1; - -#if defined(USERCONFIG) - userconfig(); - cninit(); /* the preferred console may have changed */ -#endif - kprintf("avail memory = %ju (%ju MB)\n", (uintmax_t)ptoa(vmstats.v_free_count + vmstats.v_dma_pages), (uintmax_t)ptoa(vmstats.v_free_count + vmstats.v_dma_pages) / diff --git a/sys/platform/vkernel64/x86_64/autoconf.c b/sys/platform/vkernel64/x86_64/autoconf.c index 467a477309..b2ff1f16df 100644 --- a/sys/platform/vkernel64/x86_64/autoconf.c +++ b/sys/platform/vkernel64/x86_64/autoconf.c @@ -170,10 +170,6 @@ cpu_startup(void *dummy) kmem_suballoc(&clean_map, &pager_map, &pager_sva, &pager_eva, (nswbuf*MAXPHYS) + pager_map_size); pager_map.system_map = 1; -#if defined(USERCONFIG) - userconfig(); - cninit(); /* the preferred console may have changed */ -#endif kprintf("avail memory = %lu (%luK bytes)\n", ptoa(vmstats.v_free_count), ptoa(vmstats.v_free_count) / 1024); mp_start(); diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h index ece23ebf42..f87e18c056 100644 --- a/sys/sys/reboot.h +++ b/sys/sys/reboot.h @@ -32,7 +32,6 @@ * * @(#)reboot.h 8.3 (Berkeley) 12/13/94 * $FreeBSD: src/sys/sys/reboot.h,v 1.18.2.1 2001/12/17 18:44:43 guido Exp $ - * $DragonFly: src/sys/sys/reboot.h,v 1.4 2004/06/25 05:37:59 dillon Exp $ */ #ifndef _SYS_REBOOT_H_ @@ -57,7 +56,7 @@ #define RB_RDONLY 0x080 /* mount root fs read-only */ #define RB_DUMP 0x100 /* dump kernel memory before reboot */ #define RB_MINIROOT 0x200 /* mini-root present in memory at boot time */ -#define RB_CONFIG 0x400 /* invoke user configuration routing */ +#define RB_UNUSED10 0x400 /* was: invoke user configuration routing */ #define RB_VERBOSE 0x800 /* print all potentially useful info */ #define RB_SERIAL 0x1000 /* user serial port as console */ #define RB_CDROM 0x2000 /* use cdrom as root */ -- 2.11.4.GIT