summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1996-10-15 16:26:05 +0000
committerbde <bde@FreeBSD.org>1996-10-15 16:26:05 +0000
commit24f1e6fa9a474bbc6c3562923b9a4522e72f95f8 (patch)
tree258c0b4c59682b3918c01d1a0536b07f96f39b9f
parent4af9184e0bea01af54e4f4eea2e0c9564f86df2e (diff)
downloadFreeBSD-src-24f1e6fa9a474bbc6c3562923b9a4522e72f95f8.zip
FreeBSD-src-24f1e6fa9a474bbc6c3562923b9a4522e72f95f8.tar.gz
Synchronized with biosboot/Makefile:
- use gcc-2.7.2 alignment features - get CWARNFLAGS form <bsd.kern.mk> - fixed whitespace differences.
-rw-r--r--sys/i386/boot/rawboot/Makefile14
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/i386/boot/rawboot/Makefile b/sys/i386/boot/rawboot/Makefile
index 32e8ac1..1bc8f1c 100644
--- a/sys/i386/boot/rawboot/Makefile
+++ b/sys/i386/boot/rawboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1996/09/11 19:25:11 phk Exp $
+# $Id: Makefile,v 1.2 1996/10/14 17:25:53 pst Exp $
#
PROG= boot
@@ -11,11 +11,12 @@ SRCS+= probe_keyboard.c io.c disk.c sys.c
BINDIR= /usr/mdec
BINMODE= 444
-CFLAGS= -O2 \
+CFLAGS= -O2 -malign-functions=0 -malign-jumps=0 -malign-loops=0 \
-DRAWBOOT \
-I${.CURDIR}/../biosboot \
-DBOOTWAIT=${BOOTWAIT} -DTIMEOUT=${TIMEOUT}
CFLAGS+= -DBOOTSEG=${BOOTSEG} -DBOOTSTACK=${BOOTSTACK}
+CFLAGS+= ${CWARNFLAGS}
# Probe the keyboard and use the serial console if the keyboard isn't found.
.if defined(BOOT_PROBE_KEYBOARD)
@@ -32,10 +33,10 @@ CFLAGS+= -DPROBE_KEYBOARD_LOCK
CFLAGS+= -DFORCE_COMCONSOLE
.endif
-# By default, if a serial port is going to be used as console, use COM1
+# By default, if a serial port is going to be used as console, use COM1
# (aka /dev/ttyd0).
-BOOT_COMCONSOLE_PORT?=0x3F8
-CFLAGS+= -DCOMCONSOLE=${BOOT_COMCONSOLE_PORT}
+BOOT_COMCONSOLE_PORT?=0x3F8
+CFLAGS+= -DCOMCONSOLE=${BOOT_COMCONSOLE_PORT}
# Enable code to take the default boot string from a fixed location on the
# disk. See nextboot(8) and README.386BSD for more info.
@@ -86,10 +87,11 @@ boot.nohdr: boot.strip
rawboot: boot.nohdr
dd if=boot.nohdr of=rawboot bs=8k count=1 conv=sync
-all: rawboot
+all: rawboot
install:
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\
rawboot ${DESTDIR}${BINDIR}/rawboot
+.include <bsd.kern.mk>
.include <bsd.prog.mk>
OpenPOWER on IntegriCloud