No bootinfo stuff. We'll use something different to pass device information

from the boot blocks to the kernel.

2 files changed, 3 insertions, 97 deletions

diff --git a/sys/arch/landisk/include/bootinfo.h b/sys/arch/landisk/include/bootinfo.h
deleted file mode 100644
index c81709952ef..00000000000
--- a/sys/arch/landisk/include/bootinfo.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$OpenBSD: bootinfo.h,v 1.1 2006/10/06 21:16:15 miod Exp $	*/
-/*	$NetBSD: bootinfo.h,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
-
-/*
- * Copyright (c) 1997
- *	Matthias Drochner.  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.
- *
- */
-
-struct btinfo_common {
-	int len;
-	int type;
-};
-
-#define BTINFO_BOOTPATH		0
-#define BTINFO_BOOTDISK		1
-#define BTINFO_NETIF		2
-
-struct btinfo_bootpath {
-	struct btinfo_common common;
-	char bootpath[80];
-};
-
-struct btinfo_bootdisk {
-	struct btinfo_common common;
-	int labelsector; /* label valid if != -1 */
-	struct {
-		uint16_t type, checksum;
-		char packname[16];
-	} label;
-	int biosdev;
-	int partition;
-};
-
-struct btinfo_netif {
-	struct btinfo_common common;
-	char ifname[16];
-	unsigned int tag; /* PCI, BIOS format */
-};
-
-#define BOOTINFO_MAXSIZE 4096
-
-struct bootinfo {
-        int nentries;
-	char info[BOOTINFO_MAXSIZE - sizeof(int)];
-};
-
-#ifdef _KERNEL
-void *lookup_bootinfo(int type);
-#endif
diff --git a/sys/arch/landisk/landisk/machdep.c b/sys/arch/landisk/landisk/machdep.c
index d0997d713b1..7fef5d35356 100644
--- a/sys/arch/landisk/landisk/machdep.c
+++ b/sys/arch/landisk/landisk/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.5 2006/10/25 03:59:59 drahn Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.6 2006/11/06 19:12:13 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
 /*-
@@ -94,7 +94,6 @@
 #include <sh/cache_sh4.h>
 #include <sh/mmu_sh4.h>
 
-#include <machine/bootinfo.h>
 #include <machine/cpu.h>
 
 #include <landisk/landisk/landiskreg.h>
@@ -108,10 +107,7 @@
 /* the following is used externally (sysctl_hw) */
 char machine[] = MACHINE;		/* landisk */
 
-struct bootinfo _bootinfo;
-struct bootinfo *bootinfo;
-
-__dead void landisk_startup(int, char *, void *);
+__dead void landisk_startup(int, char *);
 __dead void main(void);
 
 void
@@ -129,17 +125,12 @@ vaddr_t kernend;	/* used by /dev/mem too */
 char *esym;
 
 __dead void
-landisk_startup(int howto, char *_esym, void *bi)
+landisk_startup(int howto, char *_esym)
 {
 	/* Start to determine heap area */
 	esym = _esym;
 	kernend = (vaddr_t)round_page((vaddr_t)esym);
 
-	/* Copy bootinfo */
-	if (bi) {
-		bootinfo = &_bootinfo;
-		memcpy(bootinfo, bi, sizeof(struct bootinfo));
-	}
 	boothowto = howto;
 
 	/* Initialize CPU ops. */
@@ -189,21 +180,6 @@ landisk_startup(int howto, char *_esym, void *bi)
 	for (;;) ;
 }
 
-void *
-lookup_bootinfo(int type)
-{
-	struct btinfo_common *help;
-	int n = bootinfo->nentries;
-
-	help = (struct btinfo_common *)(bootinfo->info);
-	while (n--) {
-		if (help->type == type)
-			return (help);
-		help = (struct btinfo_common *)((char *)help + help->len);
-	}
-	return (NULL);
-}
-
 void
 boot(int howto)
 {