 @@ -1,14 +1,14 @@
-/* $NetBSD: autoconf.c,v 1.14 2012/10/13 06:16:19 tsutsui Exp $ */
+/* $NetBSD: autoconf.c,v 1.15 2014/01/11 08:07:16 tsutsui Exp $ */
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * 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.
 @@ -21,71 +21,119 @@
  * 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>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.14 2012/10/13 06:16:19 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.15 2014/01/11 08:07:16 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/reboot.h>
 #include <sys/device.h>
 #include <machine/autoconf.h>
 #include <machine/bootinfo.h>
 #include <machine/disklabel.h>
 #include <machine/cpu.h>
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
 #include <luna68k/luna68k/isr.h>
 static uint booted_adpt, booted_ctlr, booted_unit, booted_part;
 /*
  * Determine mass storage and memory configuration for a machine.
  */
 void
 cpu_configure(void)
+{
 	booted_device = NULL;	/* set by device drivers (if found) */
 	booted_adpt = B_ADAPTOR(bootdev);
 	booted_ctlr = B_CONTROLLER(bootdev);
 	booted_unit = B_UNIT(bootdev);
 	booted_part = B_PARTITION(bootdev);
 	(void)splhigh();
 	isrinit();
 	if (config_rootfound("mainbus", NULL) == NULL)
 		panic("autoconfig failed, no root");
 	spl0();
+}
 void
-cpu_rootconf(void)
+device_register(device_t dev, void *aux)
+{
-#if 1 /* XXX to be reworked with helps of 2nd stage loaders XXX */
+	static device_t booted_controller;
-	int i;
+	static bool bootdev_found;
 	const char *devname;
-	char *cp;
+	/*
-	extern char bootarg[64];
+	 * Check booted device.
 	 */
-	cp = bootarg;
+	if (bootdev_found)
-	devname = "sd0";
+		return;
 	for (i = 0; i < sizeof(bootarg); i++) {
-		if (*cp == '\0')
+	if (booted_adpt == LUNA68K_BOOTADPT_LANCE &&
-			break;
+	    device_is_a(dev, "le")) {
-		if (*cp == 'E' && memcmp("ENADDR=", cp, 7) == 0) {
+		struct mainbus_attach_args *ma = aux;
 			devname = "le0";
-			break;
+		if (booted_ctlr == 0 &&
 		    ma->ma_addr == LUNA68K_BOOTADPT_LANCE0_PA) {
 			booted_device = dev;
 			bootdev_found = true;
+		}
 		return;
+	}
 	if (booted_adpt == LUNA68K_BOOTADPT_SPC &&
 	    device_is_a(dev, "spc")) {
 		struct mainbus_attach_args *ma = aux;
 		if ((booted_ctlr == 0 &&
 		     (u_int)ma->ma_addr == LUNA68K_BOOTADPT_SPC0_PA) ||
 		    (booted_ctlr == 1 &&
 		     (u_int)ma->ma_addr == LUNA68K_BOOTADPT_SPC1_PA)) {
 			booted_controller = dev;
+		}
-		cp++;
+		return;
+	}
 	if (booted_controller != NULL &&
 	    (device_is_a(dev, "sd") || device_is_a(dev, "cd"))) {
 		struct scsipibus_attach_args *sa = aux;
 		device_t parent = device_parent(dev);
 		if (device_parent(parent) != booted_controller)
 			return;
 		if (booted_unit != sa->sa_periph->periph_target)
 			return;
 		booted_device = dev;
 		booted_partition = booted_part;
 		bootdev_found = true;
 		return;
+	}
 	booted_device = device_find_by_xname(devname);
 void
 cpu_rootconf(void)
+{
 #endif
 	printf("boot device: %s\n",
 		(booted_device) ? device_xname(booted_device) : "<unknown>");
 	rootconf();
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: locore.s,v 1.53 2013/09/23 17:02:18 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.54 2014/01/11 08:07:16 tsutsui Exp $ */
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -92,39 +92,37 @@ BSS(esym,4)
  */
 	.text
 GLOBAL(kernel_text)
 /*
  * start of kernel and .text!
  */
 ASENTRY_NOPROFILE(start)
 	movw	#PSL_HIGHIPL,%sr	| no interrupts
 	movl	#0,%a5			| RAM starts at 0
 	ASRELOC(tmpstk,%a0)
 	movl	%a0,%sp			| give ourselves a temporary stack
 #if 0 /* not sure useful values, need a bootloader tailored for us */
 	RELOC(boothowto,%a0)
 	movl	%d7,%a0@		| save boothowto
 	RELOC(bootdev,%a0)
 	movl	%d6,%a0@		| save bootdev
 #endif
 	RELOC(edata,%a0)		| clear out BSS
 	movl	#_C_LABEL(end)-4,%d0	| (must be <= 256 kB)
 	subl	#_C_LABEL(edata),%d0
 	lsrl	#2,%d0
 :	clrl	%a0@+
 	dbra	%d0,1b
 	RELOC(boothowto,%a0)
 	movl	%d7,%a0@		| save boothowto
 	RELOC(bootdev,%a0)
 	movl	%d6,%a0@		| save bootdev
 	RELOC(lowram,%a0)
 	movl	%a5,%a0@		| store start of physical memory
 	movl	#0x41000000,%a0		| available memory in bytes
 	movl	%a0@(12),%a0		| (int *)base[3])
 	movl	%a0@,%d5
 	RELOC(memavail,%a0)
 	movl	%d5,%a0@		| save memavail
 	movl	#0x41000000,%a0		| planemask; 0x0f or 0xff
 	movl	%a0@(184),%a0		| (int *)base[46]
 	movl	%a0@,%d5
 	RELOC(hwplanemask,%a0)

 @@ -1,14 +1,14 @@
-/* $NetBSD: machdep.c,v 1.95 2013/01/26 15:46:24 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.96 2014/01/11 08:07:16 tsutsui Exp $ */
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * 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.
 @@ -21,27 +21,27 @@
  * 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>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.95 2013/01/26 15:46:24 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.96 2014/01/11 08:07:16 tsutsui Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_compat_sunos.h"
 #include "opt_modular.h"
 #include "opt_panicbutton.h"
 #include "opt_m68k_arch.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 @@ -65,26 +65,27 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
 #include <sys/ksyms.h>
 #include <sys/module.h>
 #ifdef	KGDB
 #include <sys/kgdb.h>
 #endif
 #include <sys/boot_flag.h>
 #define ELFSIZE 32
 #include <sys/exec_elf.h>
 #include <uvm/uvm_extern.h>
 #include <sys/sysctl.h>
 #include <machine/bootinfo.h>
 #include <machine/cpu.h>
 #include <machine/reg.h>
 #include <machine/pcb.h>
 #include <machine/psl.h>
 #include <machine/pte.h>
 #include <machine/kcore.h>	/* XXX should be pulled in by sys/kcore.h */
 #include <dev/cons.h>
 #include <dev/mm.h>
 #if defined(DDB)
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
 @@ -184,48 +185,69 @@ luna68k_init(void)
 		pmap_kenter_pa((vaddr_t)msgbufaddr + i * PAGE_SIZE,
 		    avail_end + i * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, 0);
 	pmap_update(pmap_kernel());
 	initmsgbuf(msgbufaddr, m68k_round_page(MSGBUFSIZE));
 	pio0[3] = 0xb6;
 	pio0[2] = 1 << 6;		/* enable parity check */
 	pio0[3] = 0xb6;
 	sw1 = pio0[0];			/* dip sw1 value */
 	sw1 ^= 0xff;
 	sysconsole = !(sw1 & 0x2);	/* console selection */
 	/*
 	 * Check if boothowto and bootdev values are passed by our bootloader.
 	 */
 	if ((bootdev & B_MAGICMASK) == B_DEVMAGIC) {
 		/* Valid value is set; no need to parse bootarg. */
 		return;
+	}
 	/*
 	 * No valid bootdev value is set.
 	 * Assume we are booted by ROM monitor directly using a.out kernel
 	 * and we have to parse bootarg passed from the monitor to set
 	 * proper boothowto and check netboot.
 	 */
 	/* set default to "sd0a" with no howto flags */
 	bootdev = MAKEBOOTDEV(0, LUNA68K_BOOTADPT_SPC, 0, 0, 0);
 	boothowto = 0;
 	i = 0;
 	/*
 	 * 'bootarg' on LUNA has:
 	 *   "<args of x command> ENADDR=<addr> HOST=<host> SERVER=<name>"
 	 * where <addr> is MAC address of which network loader used (not
 	 * necessarily same as one at 0x4101.FFE0), <host> and <name>
 	 * are the values of HOST and SERVER environment variables.
+	 *
 	 * 'bootarg' on LUNA-II has "<args of x command>" only.
+	 *
 	 * NetBSD/luna68k cares only the first argment; any of "sda".
 	 */
-	for (cp = bootarg; *cp != ' ' && *cp != 0; cp++) {
+	bootarg[63] = '\0';
-		BOOT_FLAG(*cp, boothowto);
+	for (cp = bootarg; *cp != '\0'; cp++) {
-		if (i++ >= sizeof(bootarg))
+		if (*cp == '-') {
-			break;
+			char c;
 			while ((c = *cp) != '\0' && c != ' ') {
 				BOOT_FLAG(c, boothowto);
 				cp++;
+			}
 		} else if (*cp == 'E' && memcmp("ENADDR=", cp, 7) == 0) {
 			bootdev =
 			    MAKEBOOTDEV(0, LUNA68K_BOOTADPT_LANCE, 0, 0, 0);
+		}
+	}
 #if 0 /* overload 1:sw1, which now means 'go ROM monitor' after poweron */
 	if (boothowto == 0)
 		boothowto = (sw1 & 0x1) ? RB_SINGLE : 0;
 #endif
+}
 /*
  * Console initialization: called early on from main,
  */
 void
 consinit(void)
+{
 	if (sysconsole == 0)
 		syscnattach(0);
 	else {
 		omfb_cnattach();