Rename softraid boot files, which are currently in an MD location. This

will allow us to bring in a MI softraid.{c,h} in lib/libsa.

25 files changed, 47 insertions, 47 deletions

diff --git a/sys/arch/amd64/stand/boot/Makefile b/sys/arch/amd64/stand/boot/Makefile
index f72e55658fb..b22680c7748 100644
--- a/sys/arch/amd64/stand/boot/Makefile
+++ b/sys/arch/amd64/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.33 2016/09/10 16:38:16 jsing Exp $
+#	$OpenBSD: Makefile,v 1.34 2016/09/11 15:54:11 jsing Exp $
 
 COPTS?=
 MAN?=	boot.8
@@ -28,7 +28,7 @@ SRCS+=	gidt.S random_i386.S
 SRCS+=	cmd_i386.c dev_i386.c exec_i386.c gateA20.c machdep.c
 SRCS+=	bioscons.c biosdev.c diskprobe.c memprobe.c time.c
 .if ${SOFTRAID:L} == "yes"
-SRCS+=	softraid.c
+SRCS+=	softraid_amd64.c
 .endif
 
 .PATH:	${S}/lib/libsa
diff --git a/sys/arch/amd64/stand/cdboot/Makefile b/sys/arch/amd64/stand/cdboot/Makefile
index 57921f17803..c87b1d93fc4 100644
--- a/sys/arch/amd64/stand/cdboot/Makefile
+++ b/sys/arch/amd64/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.29 2016/09/10 16:38:16 jsing Exp $
+#	$OpenBSD: Makefile,v 1.30 2016/09/11 15:54:11 jsing Exp $
 
 MAN=	cdboot.8
 
@@ -19,7 +19,7 @@ BINMODE=644
 SRCS+=	machdep.c dev_i386.c exec_i386.c cmd_i386.c
 SRCS+=	gidt.S random_i386.S biosdev.c bioscons.c gateA20.c \
 	memprobe.c diskprobe.c time.c
-SRCS+=	softraid.c
+SRCS+=	softraid_amd64.c
 
 .PATH:	${S}/stand/boot
 SRCS+=	cmd.c vars.c bootarg.c
diff --git a/sys/arch/amd64/stand/efiboot/Makefile.common b/sys/arch/amd64/stand/efiboot/Makefile.common
index 9219ccff71e..69738b28c26 100644
--- a/sys/arch/amd64/stand/efiboot/Makefile.common
+++ b/sys/arch/amd64/stand/efiboot/Makefile.common
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.common,v 1.7 2016/09/10 16:38:16 jsing Exp $
+#	$OpenBSD: Makefile.common,v 1.8 2016/09/11 15:54:11 jsing Exp $
 
 S=		${.CURDIR}/../../../../..
 SADIR=		${.CURDIR}/../..
@@ -53,7 +53,7 @@ SRCS+=	loadfile.c elf64.c elf32.c memprobe.c cmd_i386.c dev_i386.c exec_i386.c
 SRCS+=	machdep.c diskprobe.c
 
 .if ${SOFTRAID:L} == "yes"
-SRCS+=	softraid.c
+SRCS+=	softraid_amd64.c
 .endif
 
 PROG.so=	${PROG:S/.EFI/.so/}
diff --git a/sys/arch/amd64/stand/efiboot/efidev.c b/sys/arch/amd64/stand/efiboot/efidev.c
index e34d47360d0..944b53a95e5 100644
--- a/sys/arch/amd64/stand/efiboot/efidev.c
+++ b/sys/arch/amd64/stand/efiboot/efidev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efidev.c,v 1.19 2016/08/31 15:11:22 yasuoka Exp $	*/
+/*	$OpenBSD: efidev.c,v 1.20 2016/09/11 15:54:11 jsing Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -39,7 +39,7 @@
 
 #ifdef SOFTRAID
 #include <dev/softraidvar.h>
-#include "softraid.h"
+#include "softraid_amd64.h"
 #endif
 
 #include <efi.h>
diff --git a/sys/arch/amd64/stand/libsa/biosdev.c b/sys/arch/amd64/stand/libsa/biosdev.c
index 0f91d8ff2e0..6f6cdff9e30 100644
--- a/sys/arch/amd64/stand/libsa/biosdev.c
+++ b/sys/arch/amd64/stand/libsa/biosdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosdev.c,v 1.27 2015/10/01 20:28:12 krw Exp $	*/
+/*	$OpenBSD: biosdev.c,v 1.28 2016/09/11 15:54:11 jsing Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -42,7 +42,7 @@
 
 #ifdef SOFTRAID
 #include <dev/softraidvar.h>
-#include "softraid.h"
+#include "softraid_amd64.h"
 #endif
 
 static const char *biosdisk_err(u_int);
diff --git a/sys/arch/amd64/stand/libsa/dev_i386.c b/sys/arch/amd64/stand/libsa/dev_i386.c
index 3803d63fb71..bc86f0e05e0 100644
--- a/sys/arch/amd64/stand/libsa/dev_i386.c
+++ b/sys/arch/amd64/stand/libsa/dev_i386.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev_i386.c,v 1.16 2015/09/18 13:30:56 miod Exp $	*/
+/*	$OpenBSD: dev_i386.c,v 1.17 2016/09/11 15:54:11 jsing Exp $	*/
 
 /*
  * Copyright (c) 1996-1999 Michael Shalayeff
@@ -38,7 +38,7 @@
 #ifdef SOFTRAID
 #include <dev/biovar.h>
 #include <dev/softraidvar.h>
-#include "softraid.h"
+#include "softraid_amd64.h"
 #endif
 
 extern int debug;
diff --git a/sys/arch/amd64/stand/libsa/diskprobe.c b/sys/arch/amd64/stand/libsa/diskprobe.c
index 067de18d5c9..ba6f875496e 100644
--- a/sys/arch/amd64/stand/libsa/diskprobe.c
+++ b/sys/arch/amd64/stand/libsa/diskprobe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diskprobe.c,v 1.16 2015/09/02 01:52:26 yasuoka Exp $	*/
+/*	$OpenBSD: diskprobe.c,v 1.17 2016/09/11 15:54:11 jsing Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -44,7 +44,7 @@
 #include "libsa.h"
 
 #ifdef SOFTRAID
-#include "softraid.h"
+#include "softraid_amd64.h"
 #endif
 #ifdef EFIBOOT
 #include "efidev.h"
diff --git a/sys/arch/amd64/stand/libsa/exec_i386.c b/sys/arch/amd64/stand/libsa/exec_i386.c
index e880927ed36..6619fb49f81 100644
--- a/sys/arch/amd64/stand/libsa/exec_i386.c
+++ b/sys/arch/amd64/stand/libsa/exec_i386.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_i386.c,v 1.16 2015/11/26 10:52:40 yasuoka Exp $	*/
+/*	$OpenBSD: exec_i386.c,v 1.17 2016/09/11 15:54:11 jsing Exp $	*/
 
 /*
  * Copyright (c) 1997-1998 Michael Shalayeff
@@ -40,7 +40,7 @@
 
 #ifdef SOFTRAID
 #include <dev/softraidvar.h>
-#include "softraid.h"
+#include "softraid_amd64.h"
 #endif
 
 #ifdef EFIBOOT
diff --git a/sys/arch/amd64/stand/libsa/softraid.c b/sys/arch/amd64/stand/libsa/softraid_amd64.c
index 2db07b31290..a0a4ea9793e 100644
--- a/sys/arch/amd64/stand/libsa/softraid.c
+++ b/sys/arch/amd64/stand/libsa/softraid_amd64.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid.c,v 1.27 2016/09/10 16:53:22 jsing Exp $	*/
+/*	$OpenBSD: softraid_amd64.c,v 1.1 2016/09/11 15:54:11 jsing Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -32,7 +32,7 @@
 
 #include "libsa.h"
 #include "disk.h"
-#include "softraid.h"
+#include "softraid_amd64.h"
 
 /* List of softraid volumes. */
 struct sr_boot_volume_head sr_volumes;
diff --git a/sys/arch/amd64/stand/libsa/softraid.h b/sys/arch/amd64/stand/libsa/softraid_amd64.h
index 603e91493e2..28a3e39de2b 100644
--- a/sys/arch/amd64/stand/libsa/softraid.h
+++ b/sys/arch/amd64/stand/libsa/softraid_amd64.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid.h,v 1.1 2012/10/27 15:43:42 jsing Exp $	*/
+/*	$OpenBSD: softraid_amd64.h,v 1.1 2016/09/11 15:54:11 jsing Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
diff --git a/sys/arch/amd64/stand/pxeboot/Makefile b/sys/arch/amd64/stand/pxeboot/Makefile
index 2058e08f973..8028301e8f1 100644
--- a/sys/arch/amd64/stand/pxeboot/Makefile
+++ b/sys/arch/amd64/stand/pxeboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.27 2016/09/10 16:38:16 jsing Exp $
+#	$OpenBSD: Makefile,v 1.28 2016/09/11 15:54:11 jsing Exp $
 
 MAN=	pxeboot.8
 
@@ -21,7 +21,7 @@ SRCS+=	machdep.c exec_i386.c cmd_i386.c
 SRCS+=	gidt.S random_i386.S biosdev.c bioscons.c gateA20.c \
 	memprobe.c diskprobe.c time.c ## biosprobe.c
 SRCS+=	pxe.c pxe_call.S pxe_net.c pxe_udp.c
-SRCS+=	softraid.c
+SRCS+=	softraid_amd64.c
 
 .PATH:	${S}/stand/boot
 SRCS+=	boot.c cmd.c vars.c bootarg.c
diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile
index 7a45dcefa94..fe16556ad45 100644
--- a/sys/arch/i386/stand/boot/Makefile
+++ b/sys/arch/i386/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.61 2016/09/10 16:38:16 jsing Exp $
+#	$OpenBSD: Makefile,v 1.62 2016/09/11 15:54:11 jsing Exp $
 
 COPTS?=
 MAN?=	boot.8
@@ -32,7 +32,7 @@ SRCS+=	apmprobe.c debug.c pciprobe.c ps2probe.c
 SRCS+=	cmd_i386.c dev_i386.c exec_i386.c gateA20.c machdep.c
 SRCS+=	bioscons.c biosdev.c diskprobe.c memprobe.c time.c
 .if ${SOFTRAID:L} == "yes"
-SRCS+=	softraid.c
+SRCS+=	softraid_i386.c
 .endif
 
 .PATH:	${S}/lib/libsa
diff --git a/sys/arch/i386/stand/cdboot/Makefile b/sys/arch/i386/stand/cdboot/Makefile
index 0d94398fd17..25c85b45000 100644
--- a/sys/arch/i386/stand/cdboot/Makefile
+++ b/sys/arch/i386/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.26 2016/09/10 16:38:16 jsing Exp $
+#	$OpenBSD: Makefile,v 1.27 2016/09/11 15:54:11 jsing Exp $
 
 MAN=	cdboot.8
 
@@ -21,7 +21,7 @@ SRCS+=	debug_i386.S gidt.S random_i386.S
 SRCS+=	cmd_i386.c dev_i386.c exec_i386.c gateA20.c machdep.c
 SRCS+=	apmprobe.c bioscons.c biosdev.c debug.c diskprobe.c memprobe.c \
 	pciprobe.c ps2probe.c time.c
-SRCS+=	softraid.c
+SRCS+=	softraid_i386.c
 
 .PATH:	${S}/stand/boot
 SRCS+=	bootarg.c cmd.c vars.c
diff --git a/sys/arch/i386/stand/libsa/biosdev.c b/sys/arch/i386/stand/libsa/biosdev.c
index 19cfa3b77a7..e2f06b28986 100644
--- a/sys/arch/i386/stand/libsa/biosdev.c
+++ b/sys/arch/i386/stand/libsa/biosdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosdev.c,v 1.92 2015/10/01 20:28:12 krw Exp $	*/
+/*	$OpenBSD: biosdev.c,v 1.93 2016/09/11 15:54:11 jsing Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -43,7 +43,7 @@
 
 #ifdef SOFTRAID
 #include <dev/softraidvar.h>
-#include "softraid.h"
+#include "softraid_i386.h"
 #endif
 
 static const char *biosdisk_err(u_int);
diff --git a/sys/arch/i386/stand/libsa/dev_i386.c b/sys/arch/i386/stand/libsa/dev_i386.c
index 6421d78c33e..7d37b7d898d 100644
--- a/sys/arch/i386/stand/libsa/dev_i386.c
+++ b/sys/arch/i386/stand/libsa/dev_i386.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev_i386.c,v 1.41 2015/09/18 13:30:56 miod Exp $	*/
+/*	$OpenBSD: dev_i386.c,v 1.42 2016/09/11 15:54:11 jsing Exp $	*/
 
 /*
  * Copyright (c) 1996-1999 Michael Shalayeff
@@ -38,7 +38,7 @@
 #ifdef SOFTRAID
 #include <dev/biovar.h>
 #include <dev/softraidvar.h>
-#include "softraid.h"
+#include "softraid_i386.h"
 #endif
 
 extern int debug;
diff --git a/sys/arch/i386/stand/libsa/diskprobe.c b/sys/arch/i386/stand/libsa/diskprobe.c
index 97aa5aade84..9b8947cfdfe 100644
--- a/sys/arch/i386/stand/libsa/diskprobe.c
+++ b/sys/arch/i386/stand/libsa/diskprobe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diskprobe.c,v 1.40 2015/09/02 04:09:24 yasuoka Exp $	*/
+/*	$OpenBSD: diskprobe.c,v 1.41 2016/09/11 15:54:11 jsing Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -44,7 +44,7 @@
 #include "libsa.h"
 
 #ifdef SOFTRAID
-#include "softraid.h"
+#include "softraid_i386.h"
 #endif
 #ifdef EFIBOOT
 #include "efidev.h"
diff --git a/sys/arch/i386/stand/libsa/exec_i386.c b/sys/arch/i386/stand/libsa/exec_i386.c
index 2cc3e9f5266..157902d49d4 100644
--- a/sys/arch/i386/stand/libsa/exec_i386.c
+++ b/sys/arch/i386/stand/libsa/exec_i386.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_i386.c,v 1.42 2015/09/18 13:30:56 miod Exp $	*/
+/*	$OpenBSD: exec_i386.c,v 1.43 2016/09/11 15:54:11 jsing Exp $	*/
 
 /*
  * Copyright (c) 1997-1998 Michael Shalayeff
@@ -40,7 +40,7 @@
 
 #ifdef SOFTRAID
 #include <dev/softraidvar.h>
-#include "softraid.h"
+#include "softraid_i386.h"
 #endif
 
 #ifdef EFIBOOT
diff --git a/sys/arch/i386/stand/libsa/softraid.c b/sys/arch/i386/stand/libsa/softraid_i386.c
index 6a28fe8ab71..82f0985f593 100644
--- a/sys/arch/i386/stand/libsa/softraid.c
+++ b/sys/arch/i386/stand/libsa/softraid_i386.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid.c,v 1.18 2016/09/10 16:53:22 jsing Exp $	*/
+/*	$OpenBSD: softraid_i386.c,v 1.1 2016/09/11 15:54:11 jsing Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -31,7 +31,7 @@
 
 #include "libsa.h"
 #include "disk.h"
-#include "softraid.h"
+#include "softraid_i386.h"
 
 /* List of softraid volumes. */
 struct sr_boot_volume_head sr_volumes;
diff --git a/sys/arch/sparc64/stand/ofwboot/softraid.h b/sys/arch/i386/stand/libsa/softraid_i386.h
index 77d43b69e9c..3742942178b 100644
--- a/sys/arch/sparc64/stand/ofwboot/softraid.h
+++ b/sys/arch/i386/stand/libsa/softraid_i386.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid.h,v 1.1 2014/11/26 19:50:03 stsp Exp $	*/
+/*	$OpenBSD: softraid_i386.h,v 1.1 2016/09/11 15:54:11 jsing Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
diff --git a/sys/arch/i386/stand/pxeboot/Makefile b/sys/arch/i386/stand/pxeboot/Makefile
index e772f88dd43..68479a3740e 100644
--- a/sys/arch/i386/stand/pxeboot/Makefile
+++ b/sys/arch/i386/stand/pxeboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.23 2016/09/10 16:38:16 jsing Exp $
+#	$OpenBSD: Makefile,v 1.24 2016/09/11 15:54:11 jsing Exp $
 
 MAN=	pxeboot.8
 
@@ -22,7 +22,7 @@ SRCS+=	cmd_i386.c exec_i386.c gateA20.c machdep.c
 SRCS+=	apmprobe.c bioscons.c biosdev.c debug.c diskprobe.c memprobe.c \
 	pciprobe.c ps2probe.c time.c
 SRCS+=	pxe_call.S pxe.c pxe_net.c pxe_udp.c
-SRCS+=	softraid.c
+SRCS+=	softraid_i386.c
 
 .PATH:	${S}/stand/boot
 SRCS+=	boot.c cmd.c vars.c bootarg.c
diff --git a/sys/arch/sparc64/stand/ofwboot/Makefile b/sys/arch/sparc64/stand/ofwboot/Makefile
index d4eddbcadc2..fb8674e624c 100644
--- a/sys/arch/sparc64/stand/ofwboot/Makefile
+++ b/sys/arch/sparc64/stand/ofwboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.21 2016/09/10 16:38:16 jsing Exp $
+#	$OpenBSD: Makefile,v 1.22 2016/09/11 15:54:11 jsing Exp $
 #	$NetBSD: Makefile,v 1.2 2001/03/04 14:50:05 mrg Exp $
 
 CURDIR=	${.CURDIR}
@@ -23,7 +23,7 @@ SOFTRAID?=	no
 SRCS=		srt0.s Locore.c alloc.c boot.c elf64_exec.c net.c netif_of.c \
 		ofdev.c vers.c
 .if ${SOFTRAID:L} == "yes"
-SRCS+=		diskprobe.c softraid.c
+SRCS+=		diskprobe.c softraid_sparc64.c
 .endif
 
 .PATH:		${S}/lib/libkern/arch/sparc64 ${S}/lib/libkern
diff --git a/sys/arch/sparc64/stand/ofwboot/boot.c b/sys/arch/sparc64/stand/ofwboot/boot.c
index e4b95fb0309..2904208f77e 100644
--- a/sys/arch/sparc64/stand/ofwboot/boot.c
+++ b/sys/arch/sparc64/stand/ofwboot/boot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boot.c,v 1.25 2016/03/07 13:21:51 naddy Exp $	*/
+/*	$OpenBSD: boot.c,v 1.26 2016/09/11 15:54:11 jsing Exp $	*/
 /*	$NetBSD: boot.c,v 1.3 2001/05/31 08:55:19 mrg Exp $	*/
 /*
  * Copyright (c) 1997, 1999 Eduardo E. Horvath.  All rights reserved.
@@ -63,7 +63,7 @@
 #include <dev/softraidvar.h>
 
 #include "disk.h"
-#include "softraid.h"
+#include "softraid_sparc64.h"
 #endif
 
 #include "ofdev.h"
diff --git a/sys/arch/sparc64/stand/ofwboot/elf64_exec.c b/sys/arch/sparc64/stand/ofwboot/elf64_exec.c
index 720e7d99ee8..bc25fcc4309 100644
--- a/sys/arch/sparc64/stand/ofwboot/elf64_exec.c
+++ b/sys/arch/sparc64/stand/ofwboot/elf64_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elf64_exec.c,v 1.7 2014/11/26 20:30:41 stsp Exp $	*/
+/*	$OpenBSD: elf64_exec.c,v 1.8 2016/09/11 15:54:11 jsing Exp $	*/
 /*	$NetBSD: elfXX_exec.c,v 1.2 2001/08/15 20:08:15 eeh Exp $	*/
 
 /*
@@ -64,7 +64,7 @@
 #include <dev/softraidvar.h>
 
 #include "disk.h"
-#include "softraid.h"
+#include "softraid_sparc64.h"
 #endif
 
 #include "openfirm.h"
diff --git a/sys/arch/sparc64/stand/ofwboot/softraid.c b/sys/arch/sparc64/stand/ofwboot/softraid_sparc64.c
index 9cb09c19b89..d123cc195f4 100644
--- a/sys/arch/sparc64/stand/ofwboot/softraid.c
+++ b/sys/arch/sparc64/stand/ofwboot/softraid_sparc64.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid.c,v 1.6 2016/09/10 16:53:22 jsing Exp $	*/
+/*	$OpenBSD: softraid_sparc64.c,v 1.1 2016/09/11 15:54:11 jsing Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -32,7 +32,7 @@
 
 #include "disk.h"
 #include "ofdev.h"
-#include "softraid.h"
+#include "softraid_sparc64.h"
 
 /* List of softraid volumes. */
 struct sr_boot_volume_head sr_volumes;
diff --git a/sys/arch/i386/stand/libsa/softraid.h b/sys/arch/sparc64/stand/ofwboot/softraid_sparc64.h
index 58cd422c13c..d3eadde44db 100644
--- a/sys/arch/i386/stand/libsa/softraid.h
+++ b/sys/arch/sparc64/stand/ofwboot/softraid_sparc64.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid.h,v 1.1 2012/10/31 13:55:58 jsing Exp $	*/
+/*	$OpenBSD: softraid_sparc64.h,v 1.1 2016/09/11 15:54:12 jsing Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>