--- - branch: MAIN date: Fri Jan 10 11:12:03 UTC 2014 files: - new: '1.10' old: '1.9' path: src/sys/arch/luna68k/stand/boot/Makefile pathrev: src/sys/arch/luna68k/stand/boot/Makefile@1.10 type: modified - new: '1.10' old: '1.9' path: src/sys/arch/luna68k/stand/boot/autoconf.c pathrev: src/sys/arch/luna68k/stand/boot/autoconf.c@1.10 type: modified - new: '1.5' old: '1.4' path: src/sys/arch/luna68k/stand/boot/boot.c pathrev: src/sys/arch/luna68k/stand/boot/boot.c@1.5 type: modified - new: '1.5' old: '1.4' path: src/sys/arch/luna68k/stand/boot/devopen.c pathrev: src/sys/arch/luna68k/stand/boot/devopen.c@1.5 type: modified - new: '1.5' old: '1.4' path: src/sys/arch/luna68k/stand/boot/if_le.c pathrev: src/sys/arch/luna68k/stand/boot/if_le.c@1.5 type: modified - new: '0' old: '1.7' path: src/sys/arch/luna68k/stand/boot/device.h pathrev: src/sys/arch/luna68k/stand/boot/device.h@0 type: deleted - new: '1.9' old: '1.8' path: src/sys/arch/luna68k/stand/boot/init_main.c pathrev: src/sys/arch/luna68k/stand/boot/init_main.c@1.9 type: modified - new: '1.9' old: '1.8' path: src/sys/arch/luna68k/stand/boot/sc.c pathrev: src/sys/arch/luna68k/stand/boot/sc.c@1.9 type: modified - new: '1.9' old: '1.8' path: src/sys/arch/luna68k/stand/boot/sd.c pathrev: src/sys/arch/luna68k/stand/boot/sd.c@1.9 type: modified - new: '1.9' old: '1.8' path: src/sys/arch/luna68k/stand/boot/version pathrev: src/sys/arch/luna68k/stand/boot/version@1.9 type: modified - new: '0' old: '1.5' path: src/sys/arch/luna68k/stand/boot/ioconf.c pathrev: src/sys/arch/luna68k/stand/boot/ioconf.c@0 type: deleted - new: '1.15' old: '1.14' path: src/sys/arch/luna68k/stand/boot/samachdep.h pathrev: src/sys/arch/luna68k/stand/boot/samachdep.h@1.15 type: modified - new: '1.2' old: '1.1' path: src/sys/arch/luna68k/stand/boot/scsivar.h pathrev: src/sys/arch/luna68k/stand/boot/scsivar.h@1.2 type: modified id: 20140110T111203Z.0fae014cc3945eabfacb6ab18775c4a33fb4941c log: | 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 : module: src subject: 'CVS commit: src/sys/arch/luna68k/stand/boot' unixtime: '1389352323' user: tsutsui