Module Name: src
Committed By: riz
Date: Sun Nov 18 19:05:23 UTC 2012
Modified Files:
src/distrib/sets/lists/base [netbsd-6]: md.x68k
src/sys/arch/x68k/include [netbsd-6]: loadfile_machdep.h
src/sys/arch/x68k/stand [netbsd-6]: Makefile
src/sys/arch/x68k/stand/boot [netbsd-6]: boot.ldscript conf.c version
src/sys/arch/x68k/stand/installboot [netbsd-6]: installboot.c
src/sys/arch/x68k/stand/libsa [netbsd-6]: Makefile Makefile.inc
consio.c devopen.c libx68k.h sdcd.c
src/sys/arch/x68k/stand/newdisk [netbsd-6]: newdisk.c
Added Files:
src/sys/arch/x68k/stand/boot [netbsd-6]: dp8390.c dp8390.h if_ne.c ne.c
ne.h
src/sys/arch/x68k/stand/libsa [netbsd-6]: clock.c
src/sys/arch/x68k/stand/netboot [netbsd-6]: Makefile boot.c conf.c
version
src/sys/arch/x68k/stand/xxboot [netbsd-6]: Makefile Makefile.xxboot
boot.S bootmain.c conf.c consio1.c version xx.c xxboot.ldscript
src/sys/arch/x68k/stand/xxboot/cdboot_cd9660 [netbsd-6]: Makefile
src/sys/arch/x68k/stand/xxboot/xxboot_ffsv1 [netbsd-6]: Makefile
src/sys/arch/x68k/stand/xxboot/xxboot_ffsv2 [netbsd-6]: Makefile
src/sys/arch/x68k/stand/xxboot/xxboot_lfsv1 [netbsd-6]: Makefile
src/sys/arch/x68k/stand/xxboot/xxboot_lfsv2 [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #645):
sys/arch/x68k/stand/newdisk/newdisk.c: revision 1.10
sys/arch/x68k/stand/xxboot/xxboot_ffsv1/Makefile: revision 1.1
sys/arch/x68k/stand/xxboot/xx.c: revision 1.1
sys/arch/x68k/stand/Makefile: revision 1.10
sys/arch/x68k/stand/Makefile: revision 1.11
sys/arch/x68k/stand/boot/conf.c: revision 1.9
sys/arch/x68k/stand/Makefile: revision 1.12
sys/arch/x68k/stand/Makefile: revision 1.13
sys/arch/x68k/include/loadfile_machdep.h: revision 1.7
sys/arch/x68k/stand/xxboot/consio1.c: revision 1.1
sys/arch/x68k/stand/libsa/sdcd.c: revision 1.12
sys/arch/x68k/stand/libsa/libx68k.h: revision 1.6
sys/arch/x68k/stand/boot/ne.c: revision 1.1
sys/arch/x68k/stand/xxboot/boot.S: revision 1.1
sys/arch/x68k/stand/libsa/sdcd.c: revision 1.13
sys/arch/x68k/stand/netboot/boot.c: revision 1.1
sys/arch/x68k/stand/libsa/devopen.c: revision 1.6
sys/arch/x68k/stand/libsa/clock.c: revision 1.1
sys/arch/x68k/stand/boot/ne.h: revision 1.1
sys/arch/x68k/stand/netboot/conf.c: revision 1.1
sys/arch/x68k/stand/boot/version: revision 1.5
sys/arch/x68k/stand/boot/version: revision 1.6
sys/arch/x68k/stand/netboot/version: revision 1.1
sys/arch/x68k/stand/xxboot/Makefile.xxboot: revision 1.1
sys/arch/x68k/stand/boot/if_ne.c: revision 1.1
sys/arch/x68k/stand/boot/dp8390.h: revision 1.1
sys/arch/x68k/stand/xxboot/xxboot_lfsv2/Makefile: revision 1.1
sys/arch/x68k/stand/boot/dp8390.c: revision 1.1
sys/arch/x68k/stand/xxboot/bootmain.c: revision 1.1
sys/arch/x68k/stand/installboot/installboot.c: revision 1.6
sys/arch/x68k/stand/xxboot/conf.c: revision 1.1
sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile: revision 1.1
sys/arch/x68k/stand/libsa/Makefile.inc: revision 1.2
distrib/sets/lists/base/md.x68k: revision 1.44
sys/arch/x68k/stand/boot/conf.c: revision 1.10
sys/arch/x68k/stand/boot/boot.ldscript: revision 1.3
distrib/sets/lists/base/md.x68k: revision 1.45
sys/arch/x68k/stand/xxboot/xxboot.ldscript: revision 1.1
sys/arch/x68k/stand/xxboot/Makefile: revision 1.15
sys/arch/x68k/stand/libsa/Makefile: revision 1.29
sys/arch/x68k/stand/xxboot/cdboot_cd9660/Makefile: revision 1.1
sys/arch/x68k/stand/netboot/Makefile: revision 1.1
sys/arch/x68k/stand/libsa/consio.c: revision 1.10
sys/arch/x68k/stand/xxboot/version: revision 1.1
sys/arch/x68k/stand/xxboot/xxboot_ffsv2/Makefile: revision 1.1
Comment fix.
Add FFSv2 support.
Fix CD support.
Initial support for xxboot (cdboot_cd9660, specifically).
Add xxboot (stage1) support.
put library first.
Fix CD support (again!).
Descend to xxboot.
Add xxboot_?fsv?.
Change to the 2-clauses license.
Tweak SUBDIR build order and add comments about each dir.
Fix a bug in check_getchar() (called from awaitkey_1sec()).
It didn't clear input key data when non ASCII keys (CTRL, OPT.1 etc)
were pressed so it couldn't detect further key inputs and
"any other key for boot menu" interrupt during boot didn't work
in that case.
The problem was tracked by Y.Sugahara,
and tested on X68030 and XM6i by me.
Bump version to denote check_getchar() bug fix.
First cut at x68k network bootloader via NE2000 on Neptune-X and Nereid.
Written by isaki@ back in 2003 based on x86's NE2000 netboot, and
misc debug and improvements by tsutsui@ and Y.Sugahara.
Tested on XM6i (emulating Nereid Ethernet) and X68030 + Neptune-X by me,
also on X68030 + Nereid and X68000 PRO-II + Xellent30 + Nereid by isaki@.
Note:
- X680x0 IPLROM doesn't support bootstrap from Neptune-X or Nereid,
so this network bootloader needs to be loaded from floppy or harddisk.
- Currently netboot support is not merged into the secondary Multi-boot
(/usr/mdec/boot) due to size restriction.
- Primary loaders assumes that the secondary bootloader name is /boot,
so /usr/mdec/netboot needs to be installed as /boot into the target
bootstrap device.
Add new /usr/mdec/netboot.
Check lp->d_npartitions before calling dkcksum()
(which is in src/sbin/disklabel/dkcksum.c) because
it doesn't check range and could cause coredump during
installboot against floppy that includes garbage in LABELSECTOR.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.43.2.1 src/distrib/sets/lists/base/md.x68k
cvs rdiff -u -r1.6 -r1.6.40.1 src/sys/arch/x68k/include/loadfile_machdep.h
cvs rdiff -u -r1.8.162.1 -r1.8.162.2 src/sys/arch/x68k/stand/Makefile
cvs rdiff -u -r1.2 -r1.2.146.1 src/sys/arch/x68k/stand/boot/boot.ldscript
cvs rdiff -u -r1.8 -r1.8.118.1 src/sys/arch/x68k/stand/boot/conf.c
cvs rdiff -u -r0 -r1.2.2.2 src/sys/arch/x68k/stand/boot/dp8390.c \
src/sys/arch/x68k/stand/boot/dp8390.h \
src/sys/arch/x68k/stand/boot/if_ne.c src/sys/arch/x68k/stand/boot/ne.c
cvs rdiff -u -r0 -r1.1.4.2 src/sys/arch/x68k/stand/boot/ne.h
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/x68k/stand/boot/version
cvs rdiff -u -r1.5 -r1.5.96.1 \
src/sys/arch/x68k/stand/installboot/installboot.c
cvs rdiff -u -r1.28 -r1.28.2.1 src/sys/arch/x68k/stand/libsa/Makefile
cvs rdiff -u -r1.1 -r1.1.14.1 src/sys/arch/x68k/stand/libsa/Makefile.inc
cvs rdiff -u -r0 -r1.2.2.2 src/sys/arch/x68k/stand/libsa/clock.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/x68k/stand/libsa/consio.c
cvs rdiff -u -r1.5 -r1.5.10.1 src/sys/arch/x68k/stand/libsa/devopen.c
cvs rdiff -u -r1.5 -r1.5.58.1 src/sys/arch/x68k/stand/libsa/libx68k.h
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/x68k/stand/libsa/sdcd.c
cvs rdiff -u -r0 -r1.2.2.2 src/sys/arch/x68k/stand/netboot/Makefile \
src/sys/arch/x68k/stand/netboot/boot.c \
src/sys/arch/x68k/stand/netboot/conf.c
cvs rdiff -u -r0 -r1.1.4.2 src/sys/arch/x68k/stand/netboot/version
cvs rdiff -u -r1.9 -r1.9.10.1 src/sys/arch/x68k/stand/newdisk/newdisk.c
cvs rdiff -u -r0 -r1.15.4.2 src/sys/arch/x68k/stand/xxboot/Makefile
cvs rdiff -u -r0 -r1.1.6.2 src/sys/arch/x68k/stand/xxboot/Makefile.xxboot \
src/sys/arch/x68k/stand/xxboot/conf.c \
src/sys/arch/x68k/stand/xxboot/consio1.c \
src/sys/arch/x68k/stand/xxboot/xxboot.ldscript
cvs rdiff -u -r0 -r1.3.2.2 src/sys/arch/x68k/stand/xxboot/boot.S
cvs rdiff -u -r0 -r1.4.2.2 src/sys/arch/x68k/stand/xxboot/bootmain.c
cvs rdiff -u -r0 -r1.2.2.2 src/sys/arch/x68k/stand/xxboot/version \
src/sys/arch/x68k/stand/xxboot/xx.c
cvs rdiff -u -r0 -r1.2.2.2 \
src/sys/arch/x68k/stand/xxboot/cdboot_cd9660/Makefile
cvs rdiff -u -r0 -r1.4.2.2 \
src/sys/arch/x68k/stand/xxboot/xxboot_ffsv1/Makefile
cvs rdiff -u -r0 -r1.4.2.2 \
src/sys/arch/x68k/stand/xxboot/xxboot_ffsv2/Makefile
cvs rdiff -u -r0 -r1.4.2.2 \
src/sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile
cvs rdiff -u -r0 -r1.4.2.2 \
src/sys/arch/x68k/stand/xxboot/xxboot_lfsv2/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
