Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin/installboot Add sun2 backend from Matthew Fredette.
details: https://anonhg.NetBSD.org/src/rev/e9824b48748f
branches: trunk
changeset: 525967:e9824b48748f
user: lukem <lukem%NetBSD.org@localhost>
date: Mon Apr 22 17:17:35 2002 +0000
description:
Add sun2 backend from Matthew Fredette.
(Implemented with "sun68k.c" as it should eventually support "sun3" as well.)
diffstat:
usr.sbin/installboot/Makefile | 16 +-
usr.sbin/installboot/arch/sun68k.c | 247 +++++++++++++++++++++++++++++++++++++
usr.sbin/installboot/installboot.8 | 6 +-
usr.sbin/installboot/installboot.h | 4 +-
usr.sbin/installboot/machines.c | 3 +-
5 files changed, 269 insertions(+), 7 deletions(-)
diffs (truncated from 355 to 300 lines):
diff -r 61c3b68f2128 -r e9824b48748f usr.sbin/installboot/Makefile
--- a/usr.sbin/installboot/Makefile Mon Apr 22 16:14:22 2002 +0000
+++ b/usr.sbin/installboot/Makefile Mon Apr 22 17:17:35 2002 +0000
@@ -1,18 +1,28 @@
-# $NetBSD: Makefile,v 1.11 2002/04/19 07:08:51 lukem Exp $
+# $NetBSD: Makefile,v 1.12 2002/04/22 17:17:35 lukem Exp $
#
PROG= installboot
SRCS= installboot.c sum.c machines.c fstypes.c \
ffs.c ffs_bswap.c \
- alpha.c pmax.c sparc64.c vax.c
+ alpha.c pmax.c sparc64.c sun68k.c vax.c
MAN= installboot.8
WARNS?= 3
UFSSRC= ${_SRC_TOP_}/sys/ufs
-CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR} -I.
.PATH: ${.CURDIR}/arch ${UFSSRC}/ffs
+
+sun68k.c: sun68k_bbinfo.h
+
+sun68k_bbinfo.h: ${_SRC_TOP_}/sys/arch/sun68k/stand/libsa/bbinfo.h
+ @echo "Copying ${.ALLSRC} to ${.TARGET}"
+ @cp ${.ALLSRC} ${.TARGET}
+
+CLEANFILES+= sun68k_bbinfo.h
+
+
.ifndef HOSTPROG
# list of MACHINEs to enable the compat symlink /usr/mdec/installboot
# XXX: eventually this should be done for all machines.
diff -r 61c3b68f2128 -r e9824b48748f usr.sbin/installboot/arch/sun68k.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.sbin/installboot/arch/sun68k.c Mon Apr 22 17:17:35 2002 +0000
@@ -0,0 +1,247 @@
+/* $NetBSD: sun68k.c,v 1.1 2002/04/22 17:17:36 lukem Exp $ */
+
+/*-
+ * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Fredette, Paul Kranenburg, and Luke Mewburn.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the NetBSD
+ * Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+#include <sys/cdefs.h>
+#if defined(__RCSID) && !defined(__lint)
+__RCSID("$NetBSD: sun68k.c,v 1.1 2002/04/22 17:17:36 lukem Exp $");
+#endif /* !__lint */
+
+#include <sys/param.h>
+#include <sys/stat.h>
+
+#include <assert.h>
+#include <err.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "installboot.h"
+#include "sun68k_bbinfo.h"
+
+#define SUN68K_BOOT_BLOCK_OFFSET DEV_BSIZE
+#define SUN68K_BOOT_BLOCK_BLOCKSIZE DEV_BSIZE
+#define SUN68K_BOOT_BLOCK_MAX_SIZE (DEV_BSIZE * 15)
+
+int
+sun68k_clearboot(ib_params *params)
+{
+ char bb[SUN68K_BOOT_BLOCK_MAX_SIZE];
+ ssize_t rv;
+
+ assert(params != NULL);
+ assert(params->fsfd != -1);
+ assert(params->filesystem != NULL);
+
+ if (params->flags & IB_STARTBLOCK) {
+ warnx("Can't use `-b bno' with `-c'");
+ return (0);
+ }
+ /* first check that it _could_ exist here */
+ rv = pread(params->fsfd, &bb, sizeof(bb), SUN68K_BOOT_BLOCK_OFFSET);
+ if (rv == -1) {
+ warn("Reading `%s'", params->filesystem);
+ return (0);
+ } else if (rv != sizeof(bb)) {
+ warnx("Reading `%s': short read", params->filesystem);
+ return (0);
+ }
+
+ /* now clear it out to nothing */
+ memset(&bb, 0, sizeof(bb));
+
+ if (params->flags & IB_VERBOSE)
+ printf("%slearing boot block\n",
+ (params->flags & IB_NOWRITE) ? "Not c" : "C");
+ if (params->flags & IB_NOWRITE)
+ return (1);
+
+ rv = pwrite(params->fsfd, &bb, sizeof(bb), SUN68K_BOOT_BLOCK_OFFSET);
+ if (rv == -1) {
+ warn("Writing `%s'", params->filesystem);
+ return (0);
+ } else if (rv != sizeof(bb)) {
+ warnx("Writing `%s': short write", params->filesystem);
+ return (0);
+ }
+
+ return (1);
+}
+
+int
+sun68k_setboot(ib_params *params)
+{
+ struct stat bootstrapsb;
+ char bb[SUN68K_BOOT_BLOCK_MAX_SIZE];
+ uint32_t startblock;
+ int retval;
+ ssize_t rv;
+ size_t bbi;
+ struct bbinfo *bbinfop; /* bbinfo in prototype image */
+ uint32_t maxblk, nblk, blk_i;
+ ib_block *blocks = NULL;
+
+ assert(params != NULL);
+ assert(params->fsfd != -1);
+ assert(params->filesystem != NULL);
+ assert(params->fstype != NULL);
+ assert(params->s1fd != -1);
+ assert(params->stage1 != NULL);
+
+ if (params->stage2 == NULL) {
+ warnx("You must provide a secondary bootstrap");
+ return (0);
+ }
+
+ retval = 0;
+
+ if (fstat(params->s1fd, &bootstrapsb) == -1) {
+ warn("Examining `%s'", params->stage1);
+ goto done;
+ }
+ if (!S_ISREG(bootstrapsb.st_mode)) {
+ warnx("`%s' must be a regular file", params->stage1);
+ goto done;
+ }
+ if (bootstrapsb.st_size > sizeof(bb)) {
+ warnx("`%s' cannot be larger than %d bytes",
+ params->stage1, sizeof(bb));
+ goto done;
+ }
+
+ memset(&bb, 0, SUN68K_BOOT_BLOCK_MAX_SIZE);
+ rv = read(params->s1fd, &bb, sizeof(bb));
+ if (rv == -1) {
+ warn("Reading `%s'", params->stage1);
+ goto done;
+ }
+
+ /*
+ * Quick sanity check that the bootstrap given
+ * is *not* an ELF executable.
+ */
+ if (memcmp(bb + 1, "ELF", strlen("ELF")) == 0) {
+ warn("`%s' is an ELF executable; need raw binary",
+ params->stage1);
+ goto done;
+ }
+
+ /* Look for the bbinfo structure. */
+ for (bbi = 0; bbi < sizeof(bb); bbi += sizeof(uint32_t)) {
+ bbinfop = (void *) (bb + bbi);
+ if (memcmp(bbinfop->bbi_magic, BBINFO_MAGIC,
+ BBINFO_MAGICSIZE) == 0)
+ break;
+ }
+ if (bbi >= sizeof(bb)) {
+ warn("`%s' does not have a bbinfo structure\n",
+ params->stage1);
+ goto done;
+ }
+ maxblk = be32toh(bbinfop->bbi_block_count);
+
+ /* Allocate space for our block list. */
+ blocks = malloc(sizeof(*blocks) * maxblk);
+ if (blocks == NULL) {
+ warn("Allocating %lu bytes",
+ (unsigned long) sizeof(*blocks) * maxblk);
+ goto done;
+ }
+
+ /* Collect the blocks for the secondary bootstrap. */
+ nblk = maxblk;
+ if (! params->fstype->findstage2(params, &nblk, blocks))
+ goto done;
+ if (nblk == 0) {
+ warnx("Secondary bootstrap `%s' is empty",
+ params->stage2);
+ goto done;
+ }
+
+ /* Save those blocks in the primary bootstrap. */
+ bbinfop->bbi_block_count = htobe32(nblk);
+ bbinfop->bbi_block_size = htobe32(blocks[0].blocksize);
+ for (blk_i = 0; blk_i < nblk; blk_i++) {
+ bbinfop->bbi_block_table[blk_i] =
+ htobe32(blocks[blk_i].block);
+ if (blocks[blk_i].blocksize < blocks[0].blocksize &&
+ blk_i + 1 != nblk) {
+ warnx("Secondary bootstrap `%s' blocks do not have " \
+ "a uniform size\n", params->stage2);
+ goto done;
+ }
+ }
+
+ if (params->flags & IB_STARTBLOCK)
+ startblock = params->startblock;
+ else
+ startblock = SUN68K_BOOT_BLOCK_OFFSET /
+ SUN68K_BOOT_BLOCK_BLOCKSIZE;
+
+ if (params->flags & IB_VERBOSE) {
+ printf("Bootstrap start sector: %#x\n", startblock);
+ printf("Bootstrap byte count: %#x\n", (unsigned)rv);
+ printf("Bootstrap block table: %u entries avail, %u used:",
+ maxblk, nblk);
+ for (blk_i = 0; blk_i < nblk; blk_i++)
+ printf(" %u", blocks[blk_i].block);
+ printf("\n%sriting bootstrap\n",
+ (params->flags & IB_NOWRITE) ? "Not w" : "W");
+ }
+ if (params->flags & IB_NOWRITE) {
+ retval = 1;
+ goto done;
+ }
+
+ rv = pwrite(params->fsfd, &bb, SUN68K_BOOT_BLOCK_MAX_SIZE,
+ startblock * SUN68K_BOOT_BLOCK_BLOCKSIZE);
+ if (rv == -1) {
+ warn("Writing `%s'", params->filesystem);
+ goto done;
+ } else if (rv != SUN68K_BOOT_BLOCK_MAX_SIZE) {
+ warnx("Writing `%s': short write", params->filesystem);
+ goto done;
+ } else
+ retval = 1;
+
+ done:
+ if (blocks != NULL)
+ free (blocks);
+ return (retval);
+}
diff -r 61c3b68f2128 -r e9824b48748f usr.sbin/installboot/installboot.8
--- a/usr.sbin/installboot/installboot.8 Mon Apr 22 16:14:22 2002 +0000
+++ b/usr.sbin/installboot/installboot.8 Mon Apr 22 17:17:35 2002 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: installboot.8,v 1.9 2002/04/19 07:08:52 lukem Exp $
+.\" $NetBSD: installboot.8,v 1.10 2002/04/22 17:17:36 lukem Exp $
.\"
.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -34,7 +34,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd April 19, 2002
Home |
Main Index |
Thread Index |
Old Index