diff options
| author | nyan <nyan@FreeBSD.org> | 2000-04-23 09:33:31 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2000-04-23 09:33:31 +0000 |
| commit | 26cbedd66b957949963a04207dc5f88b4d09885d (patch) | |
| tree | 798dd7026532f69982bccffeb927fc9ce4b61786 /sys | |
| parent | 54e6969a4139ff5b06e0fa2dcbda36c3fb6d7d8a (diff) | |
| download | FreeBSD-src-26cbedd66b957949963a04207dc5f88b4d09885d.zip FreeBSD-src-26cbedd66b957949963a04207dc5f88b4d09885d.tar.gz | |
Sync with the following changes.
sys/boot/i386/libi386/Makefile 1.16 and 1.17
sys/boot/i386/loader/Makefile 1.44
sys/boot/i386/loader/main.c 1.20
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/boot/pc98/libpc98/Makefile | 5 | ||||
| -rw-r--r-- | sys/boot/pc98/loader/Makefile | 4 | ||||
| -rw-r--r-- | sys/boot/pc98/loader/main.c | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/sys/boot/pc98/libpc98/Makefile b/sys/boot/pc98/libpc98/Makefile index ce22e40..8c2d1d9 100644 --- a/sys/boot/pc98/libpc98/Makefile +++ b/sys/boot/pc98/libpc98/Makefile @@ -8,7 +8,7 @@ INTERNALSTATICLIB= true SRCS= aout_freebsd.c biosdisk.c biosmem.c biospnp.c biospci.c \ bootinfo.c comconsole.c devicename.c elf_freebsd.c gatea20.c \ - i386_copy.c i386_module.c time.c vidconsole.c + i386_copy.c i386_module.c time.c vidconsole.c pxe.c pxetramp.s .PATH: ${.CURDIR}/../../i386/libi386 CFLAGS+= -DPC98 @@ -22,6 +22,9 @@ CFLAGS+= -DCOMPORT=${BOOT_COMCONSOLE_PORT} BOOT_COMCONSOLE_SPEED?= 9600 CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED} +# the location of libstand +CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ + # Make the disk code more talkative #CFLAGS+= -DDISK_DEBUG diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile index bb2dd8f..a9a9455 100644 --- a/sys/boot/pc98/loader/Makefile +++ b/sys/boot/pc98/loader/Makefile @@ -12,7 +12,7 @@ BINDIR?= /boot CFLAGS+= -DPC98 # architecture-specific loader code -SRCS= main.c conf.c pxe.c +SRCS= main.c conf.c .PATH: ${.CURDIR}/../../i386/loader ${.CURDIR}/../../i386/libi386 # Enable PXE TFTP or NFS support, not both. @@ -121,7 +121,7 @@ beforeinstall: ${BASE}.sym: ${OBJS} ${LIBPC98} ${LIBSTAND} ${LIBFICL} vers.o ${CC} ${LDFLAGS} -o ${.TARGET} ${BTXCRT} ${OBJS} vers.o \ - ${LIBFICL} ${LIBSTAND} ${LIBPC98} ${LIBSTAND} + ${LIBFICL} ${LIBPC98} ${LIBSTAND} # If it's not there, don't consider it a target .if exists(${.CURDIR}/../../../i386/include) diff --git a/sys/boot/pc98/loader/main.c b/sys/boot/pc98/loader/main.c index 3b58cf5..7296604 100644 --- a/sys/boot/pc98/loader/main.c +++ b/sys/boot/pc98/loader/main.c @@ -234,6 +234,11 @@ COMMAND_SET(reboot, "reboot", "reboot the system", command_reboot); static int command_reboot(int argc, char *argv[]) { + int i; + + for (i = 0; devsw[i] != NULL; ++i) + if (devsw[i]->dv_cleanup != NULL) + (devsw[i]->dv_cleanup)(); printf("Rebooting...\n"); delay(1000000); |
