From owner-svn-src-all@FreeBSD.ORG  Thu May 10 09:47:05 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9DEA11065670;
	Thu, 10 May 2012 09:47:05 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6FA328FC1C;
	Thu, 10 May 2012 09:47:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4A9l5cq027167;
	Thu, 10 May 2012 09:47:05 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4A9l5NC027162;
	Thu, 10 May 2012 09:47:05 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201205100947.q4A9l5NC027162@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Thu, 10 May 2012 09:47:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235219 - in head/sys/boot/i386: cdboot pxeldr
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 May 2012 09:47:05 -0000

Author: avg
Date: Thu May 10 09:47:04 2012
New Revision: 235219
URL: http://svn.freebsd.org/changeset/base/235219

Log:
  cdboot, pxeldr: make use of bootargs.h instead of redefining flag constants
  
  Reviewed by:	jhb
  MFC after:	1 month

Added:
  head/sys/boot/i386/cdboot/cdboot.S
     - copied, changed from r235152, head/sys/boot/i386/cdboot/cdboot.s
Deleted:
  head/sys/boot/i386/cdboot/cdboot.s
Modified:
  head/sys/boot/i386/cdboot/Makefile
  head/sys/boot/i386/pxeldr/Makefile
  head/sys/boot/i386/pxeldr/pxeldr.S

Modified: head/sys/boot/i386/cdboot/Makefile
==============================================================================
--- head/sys/boot/i386/cdboot/Makefile	Thu May 10 09:30:37 2012	(r235218)
+++ head/sys/boot/i386/cdboot/Makefile	Thu May 10 09:47:04 2012	(r235219)
@@ -4,7 +4,9 @@ PROG=	cdboot
 STRIP=
 BINMODE=${NOBINMODE}
 NO_MAN=
-SRCS=	${PROG}.s
+SRCS=	${PROG}.S
+
+CFLAGS+=-I${.CURDIR}/../common
 
 ORG=	0x7c00
 

Copied and modified: head/sys/boot/i386/cdboot/cdboot.S (from r235152, head/sys/boot/i386/cdboot/cdboot.s)
==============================================================================
--- head/sys/boot/i386/cdboot/cdboot.s	Wed May  9 04:54:50 2012	(r235152, copy source)
+++ head/sys/boot/i386/cdboot/cdboot.S	Thu May 10 09:47:04 2012	(r235219)
@@ -40,6 +40,8 @@
 # off of. 
 #
 
+#include <bootargs.h>
+
 #
 # Memory locations.
 #
@@ -62,11 +64,6 @@
 		.set AOUT_ENTRY,0x14		# entry point
 		.set AOUT_HEADER,MEM_PAGE_SIZE	# size of the a.out header
 #
-# Flags for kargs->bootflags
-#
-		.set KARGS_FLAGS_CD,0x1		# flag to indicate booting from
-						#  CD loader
-#
 # Segment selectors.
 #
 		.set SEL_SDATA,0x8		# Supervisor data

Modified: head/sys/boot/i386/pxeldr/Makefile
==============================================================================
--- head/sys/boot/i386/pxeldr/Makefile	Thu May 10 09:30:37 2012	(r235218)
+++ head/sys/boot/i386/pxeldr/Makefile	Thu May 10 09:47:04 2012	(r235219)
@@ -23,6 +23,8 @@ CFLAGS+=-DPROBE_KEYBOARD
 CFLAGS+=-DALWAYS_SERIAL
 .endif
 
+CFLAGS+=-I${.CURDIR}/../common
+
 LOADERBIN= ${.OBJDIR}/../loader/loader.bin
 
 CLEANFILES+= ${BOOT}.tmp

Modified: head/sys/boot/i386/pxeldr/pxeldr.S
==============================================================================
--- head/sys/boot/i386/pxeldr/pxeldr.S	Thu May 10 09:30:37 2012	(r235218)
+++ head/sys/boot/i386/pxeldr/pxeldr.S	Thu May 10 09:47:04 2012	(r235219)
@@ -26,6 +26,7 @@
  */
 
 #include <sys/reboot.h>
+#include <bootargs.h>
 
 /*
  * Memory locations.
@@ -50,11 +51,6 @@
 		.set AOUT_ENTRY,0x14		# entry point
 		.set AOUT_HEADER,MEM_PAGE_SIZE	# size of the a.out header
 /*
- * Flags for kargs->bootflags
- */
-		.set KARGS_FLAGS_PXE,0x2	# flag to indicate booting from
-						#  PXE loader
-/*
  * Segment selectors.
  */
 		.set SEL_SDATA,0x8		# Supervisor data