Received: by mail.netbsd.org (Postfix, from userid 605) id 1BDA714A218; Fri, 10 Jan 2014 11:12:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D1DD414A216 for ; Fri, 10 Jan 2014 11:12:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 5EeLYLFPPF35 for ; Fri, 10 Jan 2014 11:12:04 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id DB5D014A1E7 for ; Fri, 10 Jan 2014 11:12:03 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 85CE896; Fri, 10 Jan 2014 11:12:03 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Fri, 10 Jan 2014 11:12:03 +0000 From: "Izumi Tsutsui" Subject: CVS commit: src/sys/arch/luna68k/stand/boot To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20140110111203.85CE896@cvs.netbsd.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "Izumi Tsutsui" Mail-Followup-To: source-changes-d@NetBSD.org Module Name: src Committed By: tsutsui Date: Fri Jan 10 11:12:03 UTC 2014 Modified Files: src/sys/arch/luna68k/stand/boot: Makefile autoconf.c boot.c devopen.c if_le.c init_main.c samachdep.h sc.c scsivar.h sd.c version Removed Files: src/sys/arch/luna68k/stand/boot: device.h ioconf.c Log Message: Reorgenize boot device configuration. The idea is taken from OpenBSD/luna88k. - remove kernel-like autoconfiguration to probe bootable devices - initialize SCSI and Ethernet controllers statically instead - reorganize device softc structures per autoconf removal - probe and print all SCSI disks (but don't assign unit numbers) - make sdopen() to recheck the device and allocate softc dynamically - use controller number and SCSI target ID (ctlr * 10 + id) to specify the boot disk on the "boot" command arg - bump version to denote changes Now bootloader works as the following: --- >> NetBSD/luna68k boot, Revision 1.8 (Wed Jan 8 22:13:12 JST 2014) >> (based on Stinger ver 0.0 [Phase-31]) Machine model = LUNA-II Physical Memory = 0x4000000 (64 MB) sc0 at 0xe1000000: async, parity, ID 7 ID 3: TEAC FC-1 HGF 10 rev , 512 bytes/sect x 2879 sectors ID 6: IBM DPES-31080 rev S31Q, 512 bytes/sect x 2118143 sectors sc1 at 0xe1000040: async, parity, ID 7 ID 6: MELCO DSC-G rev 1.00, 512 bytes/sect x 62533295 sectors le0: Am7990 LANCE Ethernet, mem at 0x71010000 le0: Ethernet address = 00:00:0a:03:42:77 Press return to boot now, any other key for boot menu booting sd(16,0)netbsd - starting in 0 seconds. auto-boot sd(16,0)netbsd 1911696+96040 [280480+159179]=0x255a30 : To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/luna68k/stand/boot/Makefile \ src/sys/arch/luna68k/stand/boot/autoconf.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/luna68k/stand/boot/boot.c \ src/sys/arch/luna68k/stand/boot/devopen.c \ src/sys/arch/luna68k/stand/boot/if_le.c cvs rdiff -u -r1.7 -r0 src/sys/arch/luna68k/stand/boot/device.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/luna68k/stand/boot/init_main.c \ src/sys/arch/luna68k/stand/boot/sc.c src/sys/arch/luna68k/stand/boot/sd.c \ src/sys/arch/luna68k/stand/boot/version cvs rdiff -u -r1.5 -r0 src/sys/arch/luna68k/stand/boot/ioconf.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/luna68k/stand/boot/samachdep.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/stand/boot/scsivar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.