From: | Matthew Dillon <dillon@xxxxxxxxxxxxxxxxxxxxxxx> |
Date: | Sun, 9 Nov 2003 22:12:17 -0800 (PST) |
dillon 2003/11/09 22:12:17 PST DragonFly src repository Modified files: sys/bus/cam cam_periph.c cam_periph.h cam_xpt.c sys/conf Makefile.alpha Makefile.i386 Makefile.pc98 kmod.mk sys/ddb db_command.c sys/dev/misc/kbd kbd.c kbdreg.h sys/dev/misc/syscons scterm.c scvgarndr.c scvidctl.c syscons.h sys/dev/serial/ic_layer ns16550.h sys/dev/serial/sio sioreg.h sys/dev/video/fb fb.c fbreg.h sys/emulation/linux linux_ioctl.c sys/emulation/linux/i386 linux.h linux_sysvec.c sys/i386/include bootinfo.h elf.h sys/kern init_main.c kern_linker.c kern_sysctl.c link_aout.c link_elf.c subr_diskmbr.c subr_diskslice.c tty_cons.c sys/netproto/ncp ncp_conn.c sys/netproto/smb smb_conn.c sys/pc98/pc98 scgdcrndr.c sys/sys cdefs.h cons.h disklabel.h elf32.h elf64.h elf_generic.h kernel.h linker.h linker_set.h module.h reboot.h sysctl.h sys/vfs/nwfs nwfs_io.c nwfs_node.c sys/vfs/smbfs smbfs_io.c smbfs_node.c Added files: sys/i386/include metadata.h sys/sys diskmbr.h Log: Fully synchronize sys/boot from FreeBSD-5.x, but add / to the module path so /kernel will be found and loaded instead of /boot/kernel. This will give us all the capabilities of the FreeBSD-5 boot code including AMD64 and ELF64 support. As part of this work, rather then try to adjust ufs/fs.h and friends to get UFS2 info I instead copied the fs.h and friends from FreeBSD-5 into the sys/boot subtree Additionally, import Peter Wemm's linker set improvements from FreeBSD-5.x. They happen to be compatible with GCC 2.95.x and it allows very few changes to be made to the boot code. Additionally import a number of other elements from FreeBSD-5 including sys/diskmbr.h separation. Revision Changes Path 1.6 +3 -7 src/sys/bus/cam/cam_periph.c 1.4 +4 -1 src/sys/bus/cam/cam_periph.h 1.7 +15 -16 src/sys/bus/cam/cam_xpt.c 1.3 +2 -18 src/sys/conf/Makefile.alpha 1.7 +1 -17 src/sys/conf/Makefile.i386 1.3 +2 -18 src/sys/conf/Makefile.pc98 1.6 +0 -7 src/sys/conf/kmod.mk 1.6 +24 -15 src/sys/ddb/db_command.c 1.7 +8 -6 src/sys/dev/misc/kbd/kbd.c 1.3 +1 -2 src/sys/dev/misc/kbd/kbdreg.h 1.4 +4 -2 src/sys/dev/misc/syscons/scterm.c 1.4 +0 -2 src/sys/dev/misc/syscons/scvgarndr.c 1.5 +4 -2 src/sys/dev/misc/syscons/scvidctl.c 1.4 +6 -8 src/sys/dev/misc/syscons/syscons.h 1.3 +155 -10 src/sys/dev/serial/ic_layer/ns16550.h 1.3 +1 -4 src/sys/dev/serial/sio/sioreg.h 1.7 +9 -6 src/sys/dev/video/fb/fb.c 1.5 +0 -1 src/sys/dev/video/fb/fbreg.h 1.10 +0 -34 src/sys/emulation/linux/linux_ioctl.c 1.6 +0 -3 src/sys/emulation/linux/i386/linux.h 1.10 +6 -5 src/sys/emulation/linux/i386/linux_sysvec.c 1.3 +46 -1 src/sys/i386/include/bootinfo.h 1.3 +12 -1 src/sys/i386/include/elf.h 1.26 +28 -23 src/sys/kern/init_main.c 1.13 +35 -43 src/sys/kern/kern_linker.c 1.12 +4 -21 src/sys/kern/kern_sysctl.c 1.8 +43 -0 src/sys/kern/link_aout.c 1.8 +64 -0 src/sys/kern/link_elf.c 1.5 +1 -0 src/sys/kern/subr_diskmbr.c 1.7 +1 -0 src/sys/kern/subr_diskslice.c 1.8 +3 -2 src/sys/kern/tty_cons.c 1.6 +0 -2 src/sys/netproto/ncp/ncp_conn.c 1.6 +0 -2 src/sys/netproto/smb/smb_conn.c 1.3 +1 -3 src/sys/pc98/pc98/scgdcrndr.c 1.6 +50 -2 src/sys/sys/cdefs.h 1.4 +0 -1 src/sys/sys/cons.h 1.4 +0 -55 src/sys/sys/disklabel.h 1.3 +2 -1 src/sys/sys/elf32.h 1.3 +2 -1 src/sys/sys/elf64.h 1.3 +3 -1 src/sys/sys/elf_generic.h 1.6 +1 -1 src/sys/sys/kernel.h 1.4 +27 -2 src/sys/sys/linker.h 1.3 +43 -37 src/sys/sys/linker_set.h 1.3 +34 -1 src/sys/sys/module.h 1.3 +2 -1 src/sys/sys/reboot.h 1.9 +0 -6 src/sys/sys/sysctl.h 1.9 +0 -2 src/sys/vfs/nwfs/nwfs_io.c 1.9 +0 -2 src/sys/vfs/nwfs/nwfs_node.c 1.9 +0 -2 src/sys/vfs/smbfs/smbfs_io.c 1.8 +0 -1 src/sys/vfs/smbfs/smbfs_node.c http://www.dragonflybsd.org/cvsweb/src/sys/bus/cam/cam_periph.c.diff?r1=1.5&r2=1.6&f=h http://www.dragonflybsd.org/cvsweb/src/sys/bus/cam/cam_periph.h.diff?r1=1.3&r2=1.4&f=h http://www.dragonflybsd.org/cvsweb/src/sys/bus/cam/cam_xpt.c.diff?r1=1.6&r2=1.7&f=h http://www.dragonflybsd.org/cvsweb/src/sys/conf/Makefile.alpha.diff?r1=1.2&r2=1.3&f=h http://www.dragonflybsd.org/cvsweb/src/sys/conf/Makefile.i386.diff?r1=1.6&r2=1.7&f=h http://www.dragonflybsd.org/cvsweb/src/sys/conf/Makefile.pc98.diff?r1=1.2&r2=1.3&f=h http://www.dragonflybsd.org/cvsweb/src/sys/conf/kmod.mk.diff?r1=1.5&r2=1.6&f=h http://www.dragonflybsd.org/cvsweb/src/sys/ddb/db_command.c.diff?r1=1.5&r2=1.6&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/misc/kbd/kbd.c.diff?r1=1.6&r2=1.7&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/misc/kbd/kbdreg.h.diff?r1=1.2&r2=1.3&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/misc/syscons/scterm.c.diff?r1=1.3&r2=1.4&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/misc/syscons/scvgarndr.c.diff?r1=1.3&r2=1.4&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/misc/syscons/scvidctl.c.diff?r1=1.4&r2=1.5&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/misc/syscons/syscons.h.diff?r1=1.3&r2=1.4&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/serial/ic_layer/ns16550.h.diff?r1=1.2&r2=1.3&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/serial/sio/sioreg.h.diff?r1=1.2&r2=1.3&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/video/fb/fb.c.diff?r1=1.6&r2=1.7&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/video/fb/fbreg.h.diff?r1=1.4&r2=1.5&f=h http://www.dragonflybsd.org/cvsweb/src/sys/emulation/linux/linux_ioctl.c.diff?r1=1.9&r2=1.10&f=h http://www.dragonflybsd.org/cvsweb/src/sys/emulation/linux/i386/linux.h.diff?r1=1.5&r2=1.6&f=h http://www.dragonflybsd.org/cvsweb/src/sys/emulation/linux/i386/linux_sysvec.c.diff?r1=1.9&r2=1.10&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/include/bootinfo.h.diff?r1=1.2&r2=1.3&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/include/elf.h.diff?r1=1.2&r2=1.3&f=h http://www.dragonflybsd.org/cvsweb/src/sys/kern/init_main.c.diff?r1=1.25&r2=1.26&f=h http://www.dragonflybsd.org/cvsweb/src/sys/kern/kern_linker.c.diff?r1=1.12&r2=1.13&f=h http://www.dragonflybsd.org/cvsweb/src/sys/kern/kern_sysctl.c.diff?r1=1.11&r2=1.12&f=h http://www.dragonflybsd.org/cvsweb/src/sys/kern/link_aout.c.diff?r1=1.7&r2=1.8&f=h http://www.dragonflybsd.org/cvsweb/src/sys/kern/link_elf.c.diff?r1=1.7&r2=1.8&f=h http://www.dragonflybsd.org/cvsweb/src/sys/kern/subr_diskmbr.c.diff?r1=1.4&r2=1.5&f=h http://www.dragonflybsd.org/cvsweb/src/sys/kern/subr_diskslice.c.diff?r1=1.6&r2=1.7&f=h http://www.dragonflybsd.org/cvsweb/src/sys/kern/tty_cons.c.diff?r1=1.7&r2=1.8&f=h http://www.dragonflybsd.org/cvsweb/src/sys/netproto/ncp/ncp_conn.c.diff?r1=1.5&r2=1.6&f=h http://www.dragonflybsd.org/cvsweb/src/sys/netproto/smb/smb_conn.c.diff?r1=1.5&r2=1.6&f=h http://www.dragonflybsd.org/cvsweb/src/sys/pc98/pc98/scgdcrndr.c.diff?r1=1.2&r2=1.3&f=h http://www.dragonflybsd.org/cvsweb/src/sys/sys/cdefs.h.diff?r1=1.5&r2=1.6&f=h http://www.dragonflybsd.org/cvsweb/src/sys/sys/cons.h.diff?r1=1.3&r2=1.4&f=h http://www.dragonflybsd.org/cvsweb/src/sys/sys/disklabel.h.diff?r1=1.3&r2=1.4&f=h http://www.dragonflybsd.org/cvsweb/src/sys/sys/elf32.h.diff?r1=1.2&r2=1.3&f=h http://www.dragonflybsd.org/cvsweb/src/sys/sys/elf64.h.diff?r1=1.2&r2=1.3&f=h http://www.dragonflybsd.org/cvsweb/src/sys/sys/elf_generic.h.diff?r1=1.2&r2=1.3&f=h http://www.dragonflybsd.org/cvsweb/src/sys/sys/kernel.h.diff?r1=1.5&r2=1.6&f=h http://www.dragonflybsd.org/cvsweb/src/sys/sys/linker.h.diff?r1=1.3&r2=1.4&f=h http://www.dragonflybsd.org/cvsweb/src/sys/sys/linker_set.h.diff?r1=1.2&r2=1.3&f=h http://www.dragonflybsd.org/cvsweb/src/sys/sys/module.h.diff?r1=1.2&r2=1.3&f=h http://www.dragonflybsd.org/cvsweb/src/sys/sys/reboot.h.diff?r1=1.2&r2=1.3&f=h http://www.dragonflybsd.org/cvsweb/src/sys/sys/sysctl.h.diff?r1=1.8&r2=1.9&f=h http://www.dragonflybsd.org/cvsweb/src/sys/vfs/nwfs/nwfs_io.c.diff?r1=1.8&r2=1.9&f=h http://www.dragonflybsd.org/cvsweb/src/sys/vfs/nwfs/nwfs_node.c.diff?r1=1.8&r2=1.9&f=h http://www.dragonflybsd.org/cvsweb/src/sys/vfs/smbfs/smbfs_io.c.diff?r1=1.8&r2=1.9&f=h http://www.dragonflybsd.org/cvsweb/src/sys/vfs/smbfs/smbfs_node.c.diff?r1=1.7&r2=1.8&f=h