Module Name: src Committed By: jdc Date: Tue Jun 5 16:22:24 UTC 2012
Modified Files: src/sys/arch/sparc/include [netbsd-6]: bootinfo.h src/sys/arch/sparc/sparc [netbsd-6]: autoconf.c src/sys/arch/sparc/stand/boot [netbsd-6]: boot.c src/sys/arch/sparc/stand/ofwboot [netbsd-6]: boot.c src/sys/arch/sparc64/sparc64 [netbsd-6]: autoconf.c Log Message: Pull up revisions: src/sys/arch/sparc/include/bootinfo.h revision 1.6 src/sys/arch/sparc/sparc/autoconf.c revision 1.243 src/sys/arch/sparc/stand/boot/boot.c revision 1.28 src/sys/arch/sparc/stand/ofwboot/boot.c revision 1.29 src/sys/arch/sparc64/include/bootinfo.h revision 1.6-1.7 src/sys/arch/sparc64/sparc64/autoconf.c revision 1.186 (requested by martin in ticket #289). Pass the "boothowto" from the bootloader to the kernel. If (an old) bootloader did not pass the flags, check explicitly if we missed RB_USERCONF and invoke userconf_prompt() in MD code, as MI code already missed it. This fixes PR 46466. Ooops, remove definitions duplicated in <sparc/bootinfo.h> To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.112.1 src/sys/arch/sparc/include/bootinfo.h cvs rdiff -u -r1.242 -r1.242.8.1 src/sys/arch/sparc/sparc/autoconf.c cvs rdiff -u -r1.27 -r1.27.10.1 src/sys/arch/sparc/stand/boot/boot.c cvs rdiff -u -r1.28 -r1.28.10.1 src/sys/arch/sparc/stand/ofwboot/boot.c cvs rdiff -u -r1.185 -r1.185.2.1 src/sys/arch/sparc64/sparc64/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.