Module Name: src
Committed By: jdc
Date: Sat Nov 24 20:20:29 UTC 2012
Modified Files:
src/sys/arch/x68k/stand/boot [netbsd-6]: dp8390.c dp8390.h if_ne.c ne.c
src/sys/arch/x68k/stand/boot_ufs [netbsd-6]: boot.S
src/sys/arch/x68k/stand/libsa [netbsd-6]: clock.c sdcd.c
src/sys/arch/x68k/stand/netboot [netbsd-6]: Makefile boot.c conf.c
src/sys/arch/x68k/stand/xxboot [netbsd-6]: boot.S bootmain.c version
xx.c
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
Removed Files:
src/sys/arch/x68k/stand/bootlogo [netbsd-6]: MANIFEST netbsd.xpm
setbootimg.c xpm2bootimg.c
Log Message:
Pull up revisions:
src/sys/arch/x68k/stand/boot_ufs/boot.S revision 1.10
src/sys/arch/x68k/stand/boot/dp8390.c revision 1.2
src/sys/arch/x68k/stand/boot/dp8390.h revision 1.2
src/sys/arch/x68k/stand/boot/if_ne.c revision 1.2
src/sys/arch/x68k/stand/boot/ne.c revision 1.2
src/sys/arch/x68k/stand/libsa/clock.c revision 1.2
src/sys/arch/x68k/stand/netboot/Makefile revision 1.2
src/sys/arch/x68k/stand/netboot/boot.c revision 1.2
src/sys/arch/x68k/stand/netboot/conf.c revision 1.2
src/sys/arch/x68k/stand/bootlogo/MANIFEST delete
src/sys/arch/x68k/stand/bootlogo/netbsd.xpm delete
src/sys/arch/x68k/stand/bootlogo/setbootimg.c delete
src/sys/arch/x68k/stand/bootlogo/xpm2bootimg.c delete
src/sys/arch/x68k/stand/xxboot/boot.S revisions 1.2,1.3
src/sys/arch/x68k/stand/xxboot/bootmain.c revisions 1.2,1.3,1.4
src/sys/arch/x68k/stand/xxboot/xx.c revision 1.2
src/sys/arch/x68k/stand/xxboot/xxboot_ffsv1/Makefile revisions 1.2,1.3,1.4
src/sys/arch/x68k/stand/xxboot/xxboot_ffsv2/Makefile revisions 1.2,1.3,1.4
src/sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile revisions 1.2,1.3,1.4
src/sys/arch/x68k/stand/xxboot/xxboot_lfsv2/Makefile revisions 1.2,1.3,1.4
src/sys/arch/x68k/stand/xxboot/version revision 1.2
src/sys/arch/x68k/stand/xxboot/cdboot_cd9660/Makefile revision 1.2
src/sys/arch/x68k/stand/libsa/sdcd.c revision 1.14
(requested by tsutsui in ticket #707).
Fix typo in comment. s/d1/d0/
Remove my local RCS IDs.
Remove x68k/stand/bootlogo/ directory.
It was a tool before the bootloader becomes multi-stage (>10 years ago),
and it does not work anymore today.
Pull fixes in comments from x68k/stand/boot_ufs/boot.S rev 1.9 and 1.10.
Use a correct function name in .globl decl.
- fix comments
- use proper uintNN_t types
- use ANSI function decls
- remove unnecessary function decl
- remove __P()
- misc KNF and cosmetics
- use declarations in <lib/libsa/stand.h>
- remove __P() and some KNF
- remove extern variable decl
- use uintNN_t type
Set *file for FS_OPS() pathname properly in devopen().
Now bootxx_ffsv1 (and other bootxx ufs variants) work properly.
XXX: cd9660_open() in sys/lib/libsa/cd9660.c seems to open a file in
the first entry of root directory if specified path is empty.
Not sure if it's intentional behavoir.
Appease warning "nbmake: ${TOUCHPROG} expands to empty string".
Fix previous; no need to echo dummy command.
Make xxboot for ufs variants actually functional:
- set bootdev properly even on SCSI HD and floppy boot
per SDBOOT/FDBOOT/CDBOOT defines in each Makefile
- always print xxboot name and version
- use IOCS PRINT calls instead of printf to avoid size overflow in DEBUG case
- wrap debug stuff with #ifdef XXBOOT_DEBUG
- bump version to denote changes
Mostly taken from old boot_ufs.
XXX: xxboot_lfs[12] are untested.
Make sure to initialize partition offset in cdopen(),
i.e. fix an uninitialized auto variable which happened
to be zero on XM6i emulator.
Now cdboot also works on real X68030.
To generate a diff of this commit:
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 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 -r1.9 -r1.9.10.1 src/sys/arch/x68k/stand/boot_ufs/boot.S
cvs rdiff -u -r1.1 -r0 src/sys/arch/x68k/stand/bootlogo/MANIFEST \
src/sys/arch/x68k/stand/bootlogo/netbsd.xpm
cvs rdiff -u -r1.4 -r0 src/sys/arch/x68k/stand/bootlogo/setbootimg.c
cvs rdiff -u -r1.5 -r0 src/sys/arch/x68k/stand/bootlogo/xpm2bootimg.c
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/arch/x68k/stand/libsa/clock.c
cvs rdiff -u -r1.11.8.1 -r1.11.8.2 src/sys/arch/x68k/stand/libsa/sdcd.c
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 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 -r1.3.2.2 -r1.3.2.3 src/sys/arch/x68k/stand/xxboot/boot.S
cvs rdiff -u -r1.4.2.2 -r1.4.2.3 src/sys/arch/x68k/stand/xxboot/bootmain.c
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/arch/x68k/stand/xxboot/version \
src/sys/arch/x68k/stand/xxboot/xx.c
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 \
src/sys/arch/x68k/stand/xxboot/cdboot_cd9660/Makefile
cvs rdiff -u -r1.4.2.2 -r1.4.2.3 \
src/sys/arch/x68k/stand/xxboot/xxboot_ffsv1/Makefile
cvs rdiff -u -r1.4.2.2 -r1.4.2.3 \
src/sys/arch/x68k/stand/xxboot/xxboot_ffsv2/Makefile
cvs rdiff -u -r1.4.2.2 -r1.4.2.3 \
src/sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile
cvs rdiff -u -r1.4.2.2 -r1.4.2.3 \
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.
