mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-14 10:09:48 +00:00
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
This commit is contained in:
parent
a1491bb13c
commit
41088a06e7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=59535
@ -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
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user