We are done providing support for the vax.

lots of agreement.

2 files changed, 1 insertions, 62 deletions

diff --git a/usr.sbin/installboot/Makefile b/usr.sbin/installboot/Makefile
index d5a4aeb0223..a7b1393335a 100644
--- a/usr.sbin/installboot/Makefile
+++ b/usr.sbin/installboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.14 2015/12/01 15:33:17 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.15 2016/03/09 16:28:50 deraadt Exp $
 
 PROG=		installboot
 SRCS=		installboot.c util.c
@@ -85,11 +85,6 @@ SRCS += sparc64_installboot.c
 SRCS += sparc64_softraid.c
 .endif
 
-.if ${MACHINE} == "vax"
-CFLAGS += -DBOOTSTRAP
-SRCS += vax_installboot.c
-.endif
-
 .if ${MACHINE} == "zaurus"
 SRCS += stubs.c
 .endif
diff --git a/usr.sbin/installboot/vax_installboot.c b/usr.sbin/installboot/vax_installboot.c
deleted file mode 100644
index 0bb3febefb4..00000000000
--- a/usr.sbin/installboot/vax_installboot.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$OpenBSD: vax_installboot.c,v 1.5 2016/02/18 23:38:18 tobiasu Exp $	*/
-
-/*
- * Copyright (c) 2013 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "installboot.h"
-
-char	*bootldr;
-
-void
-md_init(void)
-{
-	stages = 2;
-	stage1 = "/usr/mdec/xxboot";
-	stage2 = "/usr/mdec/boot";
-
-	bootldr = "/boot";
-}
-
-void
-md_loadboot(void)
-{
-}
-
-void
-md_installboot(int devfd, char *dev)
-{
-	/* XXX - is this necessary? */
-	sync();
-
-	bootldr = fileprefix(root, bootldr);
-	if (bootldr == NULL)
-		exit(1);
-	if (!nowrite)
-		if (filecopy(stage2, bootldr) == -1)
-			exit(1);
-
-	/* Write bootblock into the superblock. */
-	bootstrap(devfd, dev, stage1, 16);
-}