Rework the boot loader:

* remove dead code,
	* streamline kernel selection logic,
	* various small bugfixes.

sys/arch/sgimips/stand/Makefile.booters

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.10 2003/10/26 07:25:37 lukem Exp $
+# $NetBSD: Makefile.booters,v 1.11 2003/11/11 06:47:00 sekiya Exp $
 
 .include <bsd.sys.mk>		# for HOST_SH
 
@@ -27,11 +27,9 @@ realall: machine-links ${PROG}
 
 .PATH:		${.CURDIR}/../common
 AFLAGS+=	-D_LOCORE -D_KERNEL -mno-abicalls
-# -I${.CURDIR}/../.. done by Makefile.inc
-#CPPFLAGS+=	-nostdinc -D_STANDALONE -DNO_ABICALLS -DHEAP_VARIABLE -I${.OBJDIR} -I${S}
 CPPFLAGS+=	-nostdinc -D_STANDALONE -DNO_ABICALLS -I${.OBJDIR} -I${S}
 # compiler flags for smallest code size
-CFLAGS=		-ffreestanding -Os -g -mmemcpy -mno-abicalls -msoft-float -G 128
+CFLAGS=		-ffreestanding -Os -Wall -Werror -mno-abicalls -msoft-float -G 1024
 LDBUG=		-T $S/arch/mips/conf/stand.ldscript
 NETBSD_VERS!=	${HOST_SH} ${.CURDIR}/../../../../conf/osrelease.sh
 CPPFLAGS+=	-DNETBSD_VERS='"${NETBSD_VERS}"'

sys/arch/sgimips/stand/common/boot.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.4 2003/08/07 16:29:27 agc Exp $	*/
+/*	$NetBSD: boot.c,v 1.5 2003/11/11 06:47:00 sekiya Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -77,6 +77,7 @@
 #include <sys/param.h>
 #include <sys/exec.h>
 #include <sys/exec_elf.h>
+#include <sys/boot_flag.h>
 
 #include <dev/arcbios/arcbios.h>
 
@@ -87,133 +88,141 @@
  * We won't go overboard with gzip'd kernel names.  After all we can
  * still boot a gzip'd kernel called "netbsd.sgimips" - it doesn't need
  * the .gz suffix.
+ *
+ * For arcane reasons, the first byte of the first element of this struct will
+ * contain a zero.  We therefore start from one.
  */
-char *kernelnames[] = {
+
+char           *kernelnames[] = {
+	"placekeeper",
 	"netbsd.sgimips",
-	"netbsd",	"netbsd.gz",
+	"netbsd",
+	"netbsd.gz",
 	"netbsd.bak",
 	"netbsd.old",
 	"onetbsd",
 	"gennetbsd",
-#ifdef notyet
-	"netbsd.el",
-#endif /*notyet*/
 	NULL
 };
 
 extern const struct arcbios_fv *ARCBIOS;
+static int      debug = 0;
 
-int main __P((int, char *[]));
+int             main(int, char **);
-
-#ifdef HEAP_VARIABLE
-void setheap(void *, void*);
-#endif
 
 /* Storage must be static. */
 struct btinfo_symtab bi_syms;
 struct btinfo_bootpath bi_bpath;
 
 /*
- * This gets arguments from the first stage boot lader, calls PROM routines
+ * This gets arguments from the ARCS monitor, calls ARCS routines to open
- * to open and load the program to boot, and then transfers execution to
+ * and load the program to boot, then transfers execution to the new program.
- * that new program.
  *
- * Argv[0] should be something like "rz(0,0,0)netbsd" on a DECstation 3100.
+ * argv[0] will be the ARCS path to the bootloader (i.e.,
- * Argv[0,1] should be something like "boot 5/rz0/netbsd" on a DECstation 5000.
+ * "pci(0)scsi(0)disk(2)rdisk(0)partition(8)/boot.ip3").
- * The argument "-a" means netbsd should do an automatic reboot.
+ *
+ * argv[1] through argv[n] will contain arguments passed from the PROM, if any.
  */
+
 int
-main(argc, argv)
+main(int argc, char **argv)
-	int argc;
-	char **argv;
 {
-	char *name/*, **namep, *dev, *kernel*/;
+	char           *kernel = NULL;
-	char /*bootname[PATH_MAX],*/ bootpath[PATH_MAX];
+	char           *bootpath = NULL;
-	void (*entry)(int, char *[], int, void *);
+	char            bootfile[PATH_MAX];
-	u_long marks[MARK_MAX];
+	void            (*entry) (int, char *[], int, void *);
-	struct arcbios_mem *mem;
+	u_long          marks[MARK_MAX];
-	int win;
+	int             win = 0;
+	int             i;
+	int             ch;
 
 	/* print a banner */
 	printf("\n");
 	printf("NetBSD/sgimips " NETBSD_VERS " Bootstrap, Revision %s\n",
-	    bootprog_rev);
+	       bootprog_rev);
 	printf("(%s, %s)\n", bootprog_maker, bootprog_date);
 	printf("\n");
 
-	/* Initialize heap from free memory descriptors */
+	memset(marks, 0, sizeof marks);
-	mem = 0;
-	do {
-		mem = ARCBIOS->GetMemoryDescriptor(mem);
-		if (mem != 0)
-			printf("Mem block: type %d base 0x%x size 0x%x\n",
-			    mem->Type, mem->BasePage * 4096, mem->PageCount * 4096);
-	} while (mem != 0);
-#ifdef HEAP_VARIABLE
-	setheap((void *)0x88200000, (void *)0x88300000);	/* XXXX */
-#endif
-	printf("Local storage %x\n", (int)&mem);
-	for (win = 0; win < argc; ++win)
-		printf("argv[%d]: %s\n", win, argv[win]);
 
 	/* initialise bootinfo structure early */
 	bi_init();
 
+	/* Parse arguments, if present.  */
+
+	while ((ch = getopt(argc, argv, "v")) != -1) {
+		switch (ch) {
+		case 'v':
+			debug = 1;
+			break;
+		}
+	}
+
 	/*
 	 * How to find partition and file to load?
-	 * OSLoaderPartition=scsi(n)disk(n)rdisk(n)partition(n)
+	 *
-	 * OSLoadFilename=netbsd
+	 * If OSLoaderPartition is not set, we're probably doing an install
-	 * path=???
+	 * from removable media.  Therefore, we'll fake up the bootpath from
-	 * argument passed to boot program
+	 * argv[0].
 	 */
-	bootpath[0] = 0;
-	name = ARCBIOS->GetEnvironmentVariable("OSLoadPartition");
-	if (name) {
-		strcpy(bootpath, name);
-		name = ARCBIOS->GetEnvironmentVariable("OSLoadFilename");
-		if (name)
-			strcat(bootpath, name);
-		else
-			strcat(bootpath, "netbsd");
-	}
-	if (strchr(argv[1], '=') == NULL) {
-		strcpy(bootpath, argv[1]);
-		if (strchr(argv[1], '(') == NULL) {
-			strcpy(bootpath,
-			    ARCBIOS->GetEnvironmentVariable("OSLoadPartition"));
-			strcat(bootpath, argv[1]);
-		}
-	}
-	printf("Boot: %s\n", bootpath);
 
-	memset(marks, 0, sizeof marks);
+	bootpath = ARCBIOS->GetEnvironmentVariable("OSLoadPartition");
-#if 0
-	if (name != NULL)
-		win = (loadfile(name, marks, LOAD_KERNEL) == 0);
-	else {
-		win = 0;
-		for (namep = kernelnames, win = 0; *namep != NULL && !win;
-		    namep++) {
-			kernel = *namep;
-			strcpy(bootpath, dev);
-			strcat(bootpath, kernel);
-			printf("Loading: %s\n", bootpath);
-			win = (loadfile(bootpath, marks, LOAD_ALL) != -1);
-			if (win) {
-				name = bootpath;
-			}
-		}
-	}
-#else
-	win = loadfile(bootpath, marks, LOAD_KERNEL) == 0;
-#endif
-	if (!win)
-		goto fail;
 
-#if 0
+	if (bootpath == NULL) {
+		/* XXX need to actually do the fixup */
+		printf("\nPlease set the OSLoadPartition environment variable.\n");
+		return 0;
+	}
+
+	/*
+	 * Grab OSLoadFilename from ARCS.
+	 */
+
+	kernel = ARCBIOS->GetEnvironmentVariable("OSLoadFilename");
+
+	/*
+	 * argv[1] is assumed to contain the name of the kernel to boot,
+	 * if it a) does not start with a hyphen and b) does not contain
+	 * an equals sign.
+	 */
+
+	if (((strchr(argv[1], '=')) == NULL) && (argv[1][0] != '-'))
+		kernel = argv[1];
+
+	if (kernel != NULL) {
+		/*
+		 * if the name contains parenthesis, we assume that it
+		 * contains the bootpath and ignore anything passed through
+		 * the environment
+		 */
+		if (strchr(kernel, '('))
+			win = loadfile(kernel, marks, LOAD_KERNEL);
+		else {
+			strcpy(bootfile, bootpath);
+			strcat(bootfile, kernel);
+			win = loadfile(bootfile, marks, LOAD_KERNEL);
+		}
+
+	} else {
+		i = 1;
+		while (kernelnames[i] != NULL) {
+			strcpy(bootfile, bootpath);
+			strcat(bootfile, kernelnames[i]);
+			kernel = kernelnames[i];
+			win = loadfile(bootfile, marks, LOAD_KERNEL);
+			if (win != -1)
+				break;
+			i++;
+		}
+
+	}
+
+	if (win < 0) {
+		printf("Boot failed!  Halting...\n");
+		return 0;
+	}
 	strncpy(bi_bpath.bootpath, kernel, BTINFO_BOOTPATH_LEN);
-	bi_add(&bi_bpath, BTINFO_BOOTPATH, sizeof(bi_bpath));
+	bi_add(&bi_bpath, BTINFO_BOOTPATH);
-#endif
 
 	entry = (void *) marks[MARK_ENTRY];
 	bi_syms.nsym = marks[MARK_NSYM];
@@ -221,16 +230,14 @@ main(argc, argv)
 	bi_syms.esym = marks[MARK_END];
 	bi_add(&bi_syms, BTINFO_SYMTAB);
 
-	printf("Starting at %p\n\n", entry);
+	if (debug) {
-	printf("nsym 0x%lx ssym 0x%lx esym 0x%lx\n", marks[MARK_NSYM],
+		printf("Starting at %p\n\n", entry);
-	    marks[MARK_SYM], marks[MARK_END]);
+		printf("nsym 0x%lx ssym 0x%lx esym 0x%lx\n", marks[MARK_NSYM],
+		       marks[MARK_SYM], marks[MARK_END]);
+	}
 	ARCBIOS->FlushAllCaches();
-	(*entry)(argc, argv, BOOTINFO_MAGIC, bootinfo);
+	(*entry) (argc, argv, BOOTINFO_MAGIC, bootinfo);
 
 	printf("Kernel returned!  Halting...\n");
 	return (0);
-
- fail:
-	(void)printf("Boot failed!  Halting...\n");
-	return (0);
 }