Module Name: src
Committed By: maxv
Date: Sat Jul 29 06:29:32 UTC 2017
Modified Files:
src/sys/arch/i386/conf: files.i386
src/sys/arch/i386/i386: autoconf.c locore.S machdep.c
src/sys/arch/xen/conf: files.compat
src/sys/arch/xen/x86: autoconf.c
Log Message:
Remove the remaining parts of compat_oldboot.
To generate a diff of this commit:
cvs rdiff -u -r1.379 -r1.380 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/i386/i386/autoconf.c
cvs rdiff -u -r1.146 -r1.147 src/sys/arch/i386/i386/locore.S
cvs rdiff -u -r1.785 -r1.786 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/xen/conf/files.compat
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/xen/x86/autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/files.i386
diff -u src/sys/arch/i386/conf/files.i386:1.379 src/sys/arch/i386/conf/files.i386:1.380
--- src/sys/arch/i386/conf/files.i386:1.379 Wed Jul 12 16:59:41 2017
+++ src/sys/arch/i386/conf/files.i386 Sat Jul 29 06:29:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.i386,v 1.379 2017/07/12 16:59:41 maxv Exp $
+# $NetBSD: files.i386,v 1.380 2017/07/29 06:29:31 maxv Exp $
#
# new style config file for i386 architecture
#
@@ -35,9 +35,6 @@ defparam opt_realmem.h REALBASEMEM REALE
# The PHYSMEM_MAX_{SIZE,ADDR} optionms
defparam opt_physmem.h PHYSMEM_MAX_ADDR PHYSMEM_MAX_SIZE
-# understand boot device passed by pre-1.3 bootblocks
-defflag COMPAT_OLDBOOT
-
# PCI BIOS options
defflag opt_pcibios.h PCIBIOS PCIBIOSVERBOSE
PCIBIOS_INTR_GUESS PCIINTR_DEBUG
Index: src/sys/arch/i386/i386/autoconf.c
diff -u src/sys/arch/i386/i386/autoconf.c:1.103 src/sys/arch/i386/i386/autoconf.c:1.104
--- src/sys/arch/i386/i386/autoconf.c:1.103 Tue May 23 08:48:34 2017
+++ src/sys/arch/i386/i386/autoconf.c Sat Jul 29 06:29:31 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.103 2017/05/23 08:48:34 nonaka Exp $ */
+/* $NetBSD: autoconf.c,v 1.104 2017/07/29 06:29:31 maxv Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -46,9 +46,8 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.103 2017/05/23 08:48:34 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.104 2017/07/29 06:29:31 maxv Exp $");
-#include "opt_compat_oldboot.h"
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.146 src/sys/arch/i386/i386/locore.S:1.147
--- src/sys/arch/i386/i386/locore.S:1.146 Sat Jul 1 10:44:42 2017
+++ src/sys/arch/i386/i386/locore.S Sat Jul 29 06:29:31 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.146 2017/07/01 10:44:42 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.147 2017/07/29 06:29:31 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -128,9 +128,8 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.146 2017/07/01 10:44:42 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.147 2017/07/29 06:29:31 maxv Exp $");
-#include "opt_compat_oldboot.h"
#include "opt_copy_symtab.h"
#include "opt_ddb.h"
#include "opt_modular.h"
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.785 src/sys/arch/i386/i386/machdep.c:1.786
--- src/sys/arch/i386/i386/machdep.c:1.785 Sat Jul 22 09:01:46 2017
+++ src/sys/arch/i386/i386/machdep.c Sat Jul 29 06:29:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.785 2017/07/22 09:01:46 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.786 2017/07/29 06:29:32 maxv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.785 2017/07/22 09:01:46 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.786 2017/07/29 06:29:32 maxv Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@@ -337,14 +337,6 @@ native_loader(int bl_boothowto, int bl_b
*RELOC(int *, &boothowto) = bl_boothowto;
-#ifdef COMPAT_OLDBOOT
- /*
- * Pre-1.3 boot loaders gave the boot device as a parameter
- * (instead of a bootinfo entry).
- */
- *RELOC(int *, &bootdev) = bl_bootdev;
-#endif
-
/*
* The boot loader provides a physical, non-relocated address
* for the symbols table's end. We need to convert it to a
Index: src/sys/arch/xen/conf/files.compat
diff -u src/sys/arch/xen/conf/files.compat:1.26 src/sys/arch/xen/conf/files.compat:1.27
--- src/sys/arch/xen/conf/files.compat:1.26 Wed Jul 12 16:59:41 2017
+++ src/sys/arch/xen/conf/files.compat Sat Jul 29 06:29:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.compat,v 1.26 2017/07/12 16:59:41 maxv Exp $
+# $NetBSD: files.compat,v 1.27 2017/07/29 06:29:32 maxv Exp $
# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
# options for MP configuration through the MP spec
@@ -39,9 +39,6 @@ defflag opt_xserver.h XXXXSERVER XXXXS
# The REAL{BASE,EXT}MEM options
defparam opt_realmem.h XXXREALBASEMEM XXXREALEXTMEM
-# understand boot device passed by pre-1.3 bootblocks
-defflag opt_compat_oldboot.h XXXCOMPAT_OLDBOOT
-
# Large page size
defflag opt_largepages.h XXXLARGEPAGES
Index: src/sys/arch/xen/x86/autoconf.c
diff -u src/sys/arch/xen/x86/autoconf.c:1.18 src/sys/arch/xen/x86/autoconf.c:1.19
--- src/sys/arch/xen/x86/autoconf.c:1.18 Tue May 23 08:48:35 2017
+++ src/sys/arch/xen/x86/autoconf.c Sat Jul 29 06:29:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.18 2017/05/23 08:48:35 nonaka Exp $ */
+/* $NetBSD: autoconf.c,v 1.19 2017/07/29 06:29:32 maxv Exp $ */
/* NetBSD: autoconf.c,v 1.75 2003/12/30 12:33:22 pk Exp */
/*-
@@ -45,10 +45,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.18 2017/05/23 08:48:35 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2017/07/29 06:29:32 maxv Exp $");
#include "opt_xen.h"
-#include "opt_compat_oldboot.h"
#include "opt_multiprocessor.h"
#include "opt_nfs_boot.h"
@@ -58,9 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#include <sys/disklabel.h>
#include <sys/disk.h>
#include <sys/conf.h>
-#ifdef COMPAT_OLDBOOT
-#include <sys/reboot.h>
-#endif
#include <sys/device.h>
#include <sys/vnode.h>
#include <sys/fcntl.h>
