diff options
| author | avg <avg@FreeBSD.org> | 2012-05-10 09:47:04 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2012-05-10 09:47:04 +0000 |
| commit | 53e91930d00af0ca6559a077f205d30b4d0ff0f6 (patch) | |
| tree | 9e393b13e5054ae040d911b8588404b83ad084be /sys/boot/i386 | |
| parent | 0b215c6420b1aa0abefea0c0d0a5fe84259fa572 (diff) | |
| download | FreeBSD-src-53e91930d00af0ca6559a077f205d30b4d0ff0f6.zip FreeBSD-src-53e91930d00af0ca6559a077f205d30b4d0ff0f6.tar.gz | |
cdboot, pxeldr: make use of bootargs.h instead of redefining flag constants
Reviewed by: jhb
MFC after: 1 month
Diffstat (limited to 'sys/boot/i386')
| -rw-r--r-- | sys/boot/i386/cdboot/Makefile | 4 | ||||
| -rw-r--r-- | sys/boot/i386/cdboot/cdboot.S (renamed from sys/boot/i386/cdboot/cdboot.s) | 7 | ||||
| -rw-r--r-- | sys/boot/i386/pxeldr/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/i386/pxeldr/pxeldr.S | 6 |
4 files changed, 8 insertions, 11 deletions
diff --git a/sys/boot/i386/cdboot/Makefile b/sys/boot/i386/cdboot/Makefile index 7656a5b..fe370bc 100644 --- a/sys/boot/i386/cdboot/Makefile +++ b/sys/boot/i386/cdboot/Makefile @@ -4,7 +4,9 @@ PROG= cdboot STRIP= BINMODE=${NOBINMODE} NO_MAN= -SRCS= ${PROG}.s +SRCS= ${PROG}.S + +CFLAGS+=-I${.CURDIR}/../common ORG= 0x7c00 diff --git a/sys/boot/i386/cdboot/cdboot.s b/sys/boot/i386/cdboot/cdboot.S index 7d2a840..46d633c 100644 --- a/sys/boot/i386/cdboot/cdboot.s +++ b/sys/boot/i386/cdboot/cdboot.S @@ -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 diff --git a/sys/boot/i386/pxeldr/Makefile b/sys/boot/i386/pxeldr/Makefile index f4fd65d..af3a436 100644 --- a/sys/boot/i386/pxeldr/Makefile +++ b/sys/boot/i386/pxeldr/Makefile @@ -23,6 +23,8 @@ CFLAGS+=-DPROBE_KEYBOARD CFLAGS+=-DALWAYS_SERIAL .endif +CFLAGS+=-I${.CURDIR}/../common + LOADERBIN= ${.OBJDIR}/../loader/loader.bin CLEANFILES+= ${BOOT}.tmp diff --git a/sys/boot/i386/pxeldr/pxeldr.S b/sys/boot/i386/pxeldr/pxeldr.S index 897e838..b91fb9b 100644 --- a/sys/boot/i386/pxeldr/pxeldr.S +++ b/sys/boot/i386/pxeldr/pxeldr.S @@ -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 |
