[Midnightbsd-cvs] src: i386/boot2: Merge changes.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Merge changes.

Modified Files:
--------------
    src/sys/boot/i386/boot2:
        Makefile (r1.4 -> r1.5)
        boot1.S (r1.2 -> r1.3)

-------------- next part --------------
Index: boot1.S
===================================================================
RCS file: /home/cvs/src/sys/boot/i386/boot2/boot1.S,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/boot/i386/boot2/boot1.S -L sys/boot/i386/boot2/boot1.S -u -r1.2 -r1.3
--- sys/boot/i386/boot2/boot1.S
+++ sys/boot/i386/boot2/boot1.S
@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.30 2004/08/28 08:32:23 yar Exp $
+ * $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.31 2006/04/11 20:09:42 jhb Exp $
  */
 
 /* Memory Locations */
@@ -212,7 +212,7 @@
 		jnz seta20.2			# Yes
 		movb $0xdf,%al			# Enable
 		outb %al,$0x60			#  A20
-seta20.3:	sti				# Enable interupts
+seta20.3:	sti				# Enable interrupts
 
 		jmp start+MEM_JMP-MEM_ORG	# Start BTX
 
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sys/boot/i386/boot2/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L sys/boot/i386/boot2/Makefile -L sys/boot/i386/boot2/Makefile -u -r1.4 -r1.5
--- sys/boot/i386/boot2/Makefile
+++ sys/boot/i386/boot2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.58 2005/03/15 18:43:36 obrien Exp $
+# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.60 2007/05/19 05:07:47 kan Exp $
 
 FILES=		boot boot1 boot2
 
@@ -36,7 +36,8 @@
 	-I${.CURDIR}/../btx/lib -I. \
 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
-	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings
+	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
+	-Winline --param max-inline-insns-single=100
 
 LDFLAGS=-static -N --gc-sections