diff options
| author | ru <ru@FreeBSD.org> | 2004-02-06 12:58:32 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2004-02-06 12:58:32 +0000 |
| commit | 3ef89b60eb5cca46cd4edbfa293ed9dde61fdc5a (patch) | |
| tree | f4453d269da8fc85db282860184121102037a2df | |
| parent | 0ff02d8b3375e71f9dc0bae4a6725b130c185a47 (diff) | |
| download | FreeBSD-src-3ef89b60eb5cca46cd4edbfa293ed9dde61fdc5a.zip FreeBSD-src-3ef89b60eb5cca46cd4edbfa293ed9dde61fdc5a.tar.gz | |
Inherit BINDIR from a parent Makefile.inc.
| -rw-r--r-- | sys/boot/i386/Makefile.inc | 2 | ||||
| -rw-r--r-- | sys/boot/i386/boot0/Makefile | 1 | ||||
| -rw-r--r-- | sys/boot/i386/boot2/Makefile | 1 | ||||
| -rw-r--r-- | sys/boot/i386/cdboot/Makefile | 1 | ||||
| -rw-r--r-- | sys/boot/i386/gptboot/Makefile | 1 | ||||
| -rw-r--r-- | sys/boot/i386/loader/Makefile | 1 | ||||
| -rw-r--r-- | sys/boot/i386/mbr/Makefile | 1 | ||||
| -rw-r--r-- | sys/boot/i386/pxeldr/Makefile | 1 |
8 files changed, 2 insertions, 7 deletions
diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc index f390a08..2d126f4 100644 --- a/sys/boot/i386/Makefile.inc +++ b/sys/boot/i386/Makefile.inc @@ -2,6 +2,8 @@ # # $FreeBSD$ +BINDIR?= /boot + LOADER_ADDRESS?= 0x200000 CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 diff --git a/sys/boot/i386/boot0/Makefile b/sys/boot/i386/boot0/Makefile index 057268b..44fdfbc 100644 --- a/sys/boot/i386/boot0/Makefile +++ b/sys/boot/i386/boot0/Makefile @@ -3,7 +3,6 @@ PROG?= boot0 NOMAN= STRIP= -BINDIR?= /boot BINMODE= 444 M4?= m4 diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile index aa8c0cd..4c884a4 100644 --- a/sys/boot/i386/boot2/Makefile +++ b/sys/boot/i386/boot2/Makefile @@ -3,7 +3,6 @@ PROG= boot2 NOMAN= STRIP= -BINDIR?= /boot BINMODE= 444 CLEANFILES= boot boot1 boot1.out boot1.o \ boot2.ldr boot2.bin boot2.ld boot2.out boot2.o boot2.h \ diff --git a/sys/boot/i386/cdboot/Makefile b/sys/boot/i386/cdboot/Makefile index 9e8e813..20ff9f9 100644 --- a/sys/boot/i386/cdboot/Makefile +++ b/sys/boot/i386/cdboot/Makefile @@ -7,7 +7,6 @@ ORG= 0x7c00 PROG= cdboot NOMAN= STRIP= -BINDIR?= /boot ${PROG}: ${PROG}.o ${LD} -N -e start -Ttext ${ORG} -o ${PROG}.out ${PROG}.o diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile index aa8c0cd..4c884a4 100644 --- a/sys/boot/i386/gptboot/Makefile +++ b/sys/boot/i386/gptboot/Makefile @@ -3,7 +3,6 @@ PROG= boot2 NOMAN= STRIP= -BINDIR?= /boot BINMODE= 444 CLEANFILES= boot boot1 boot1.out boot1.o \ boot2.ldr boot2.bin boot2.ld boot2.out boot2.o boot2.h \ diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index 4d87aa3..dce1cf2 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -3,7 +3,6 @@ PROG= loader STRIP= NEWVERSWHAT= "bootstrap loader" i386 -BINDIR?= /boot INSTALLFLAGS= -b # architecture-specific loader code diff --git a/sys/boot/i386/mbr/Makefile b/sys/boot/i386/mbr/Makefile index 50add632..8fa64e1 100644 --- a/sys/boot/i386/mbr/Makefile +++ b/sys/boot/i386/mbr/Makefile @@ -3,7 +3,6 @@ PROG= mbr NOMAN= STRIP= -BINDIR?= /boot BINMODE= 444 ORG= 0x600 diff --git a/sys/boot/i386/pxeldr/Makefile b/sys/boot/i386/pxeldr/Makefile index f471595..9e533cb 100644 --- a/sys/boot/i386/pxeldr/Makefile +++ b/sys/boot/i386/pxeldr/Makefile @@ -10,7 +10,6 @@ LOADER= loader PROG= ${BOOT} MAN= ${BOOT}.8 STRIP= -BINDIR?= /boot M4?= m4 .if defined(BOOT_PXELDR_PROBE_KEYBOARD) |
