svn commit: r235219 - in head/sys/boot/i386: cdboot pxeldr

[Andriy Gapon]

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