From b533f63ed05d9ac22d2de89369e06ba4de98f801 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 25 Oct 2017 15:27:58 +0000
Subject: [PATCH] Move BINDIR definition to defs.mk, and override where it
 isn't /boot (those files already do that so weren't changed).

Sponsored by: Netflix
---
 sys/boot/arm/uboot/Makefile          | 1 -
 sys/boot/defs.mk                     | 3 +++
 sys/boot/efi/Makefile.inc            | 2 --
 sys/boot/i386/Makefile.inc           | 2 --
 sys/boot/mips/beri/Makefile.inc      | 1 -
 sys/boot/mips/beri/boot2/Makefile    | 1 -
 sys/boot/mips/uboot/Makefile         | 1 -
 sys/boot/powerpc/boot1.chrp/Makefile | 1 -
 sys/boot/powerpc/kboot/Makefile      | 1 -
 sys/boot/powerpc/ofw/Makefile        | 1 -
 sys/boot/powerpc/ps3/Makefile        | 1 -
 sys/boot/powerpc/uboot/Makefile      | 1 -
 sys/boot/sparc64/Makefile.inc        | 1 -
 13 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/sys/boot/arm/uboot/Makefile b/sys/boot/arm/uboot/Makefile
index aacb8c1cb3e4..a3b228d732fc 100644
--- a/sys/boot/arm/uboot/Makefile
+++ b/sys/boot/arm/uboot/Makefile
@@ -5,7 +5,6 @@
 FILES=		ubldr ubldr.bin
 
 NEWVERSWHAT=	"U-Boot loader" ${MACHINE_ARCH}
-BINDIR?=	/boot
 INSTALLFLAGS=	-b
 WARNS?=		1
 # Address at which ubldr will be loaded.
diff --git a/sys/boot/defs.mk b/sys/boot/defs.mk
index 81acd2aff1a9..eda2326e37f8 100644
--- a/sys/boot/defs.mk
+++ b/sys/boot/defs.mk
@@ -15,6 +15,9 @@ UBOOTSRC=	${BOOTSRC}/uboot
 
 BOOTOBJ=	${OBJTOP}/sys/boot
 
+# BINDIR is where we install
+BINDIR?=	/boot
+
 # NB: The makefiles depend on these being empty when we don't build forth.
 .if ${MK_FORTH} != "no"
 LIBFICL=	${BOOTOBJ}/ficl/libficl.a
diff --git a/sys/boot/efi/Makefile.inc b/sys/boot/efi/Makefile.inc
index 405f4cd76018..4fd8762e1a21 100644
--- a/sys/boot/efi/Makefile.inc
+++ b/sys/boot/efi/Makefile.inc
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-BINDIR?=	/boot
-
 .if ${MACHINE_CPUARCH} == "i386"
 CFLAGS+=        -march=i386
 CFLAGS+=	-mno-aes
diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc
index 6377c46c4595..770a8eda5cf7 100644
--- a/sys/boot/i386/Makefile.inc
+++ b/sys/boot/i386/Makefile.inc
@@ -2,8 +2,6 @@
 #
 # $FreeBSD$
 
-BINDIR?=	/boot
-
 LOADER_ADDRESS?=0x200000
 CFLAGS+=	-march=i386 -ffreestanding
 CFLAGS.gcc+=	-mpreferred-stack-boundary=2
diff --git a/sys/boot/mips/beri/Makefile.inc b/sys/boot/mips/beri/Makefile.inc
index ef5a7cee7413..a12699c3a6f7 100644
--- a/sys/boot/mips/beri/Makefile.inc
+++ b/sys/boot/mips/beri/Makefile.inc
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-BINDIR?=	/boot
 CFLAGS+=	-ffreestanding
 LDFLAGS+=	-nostdlib
 
diff --git a/sys/boot/mips/beri/boot2/Makefile b/sys/boot/mips/beri/boot2/Makefile
index 9a32a37ba76a..7cb9fd568220 100644
--- a/sys/boot/mips/beri/boot2/Makefile
+++ b/sys/boot/mips/beri/boot2/Makefile
@@ -29,7 +29,6 @@
 #
 # $FreeBSD$
 
-BINDIR?=	/boot
 INSTALLFLAGS=	-b
 
 LOADERS=	flashboot jtagboot
diff --git a/sys/boot/mips/uboot/Makefile b/sys/boot/mips/uboot/Makefile
index 1084a6c8396e..73bff4e01247 100644
--- a/sys/boot/mips/uboot/Makefile
+++ b/sys/boot/mips/uboot/Makefile
@@ -5,7 +5,6 @@
 FILES=		ubldr
 
 NEWVERSWHAT=	"U-Boot loader" ${MACHINE_ARCH}
-BINDIR?=	/boot
 INSTALLFLAGS=	-b
 WARNS?=		1
 # Address at which ubldr will be loaded.
diff --git a/sys/boot/powerpc/boot1.chrp/Makefile b/sys/boot/powerpc/boot1.chrp/Makefile
index 9ebd7a821549..326492a1650a 100644
--- a/sys/boot/powerpc/boot1.chrp/Makefile
+++ b/sys/boot/powerpc/boot1.chrp/Makefile
@@ -4,7 +4,6 @@ SSP_CFLAGS=
 
 PROG=           boot1.elf
 NEWVERSWHAT=    "Open Firmware boot block" ${MACHINE_ARCH}
-BINDIR?=        /boot
 INSTALLFLAGS=   -b
 
 FILES=		boot1.hfs
diff --git a/sys/boot/powerpc/kboot/Makefile b/sys/boot/powerpc/kboot/Makefile
index 6a077739489c..d866bea2e197 100644
--- a/sys/boot/powerpc/kboot/Makefile
+++ b/sys/boot/powerpc/kboot/Makefile
@@ -6,7 +6,6 @@ MAN=
 
 PROG=		loader.kboot
 NEWVERSWHAT=	"kboot loader" ${MACHINE_ARCH}
-BINDIR?=	/boot
 INSTALLFLAGS=	-b
 
 # Architecture-specific loader code
diff --git a/sys/boot/powerpc/ofw/Makefile b/sys/boot/powerpc/ofw/Makefile
index 568f665d6613..820a9dc9d6fa 100644
--- a/sys/boot/powerpc/ofw/Makefile
+++ b/sys/boot/powerpc/ofw/Makefile
@@ -6,7 +6,6 @@ MAN=
 
 PROG=		loader
 NEWVERSWHAT=	"Open Firmware loader" ${MACHINE_ARCH}
-BINDIR?=	/boot
 INSTALLFLAGS=	-b
 
 # Architecture-specific loader code
diff --git a/sys/boot/powerpc/ps3/Makefile b/sys/boot/powerpc/ps3/Makefile
index 87255baa1142..bed099df043b 100644
--- a/sys/boot/powerpc/ps3/Makefile
+++ b/sys/boot/powerpc/ps3/Makefile
@@ -6,7 +6,6 @@ MAN=
 
 PROG=		loader.ps3
 NEWVERSWHAT=	"Playstation 3 loader" ${MACHINE_ARCH}
-BINDIR?=	/boot
 INSTALLFLAGS=	-b
 
 # Architecture-specific loader code
diff --git a/sys/boot/powerpc/uboot/Makefile b/sys/boot/powerpc/uboot/Makefile
index f15208212e08..977d9dbd05e0 100644
--- a/sys/boot/powerpc/uboot/Makefile
+++ b/sys/boot/powerpc/uboot/Makefile
@@ -4,7 +4,6 @@
 
 PROG=		ubldr
 NEWVERSWHAT=	"U-Boot loader" ${MACHINE_ARCH}
-BINDIR?=	/boot
 INSTALLFLAGS=	-b
 MAN=
 
diff --git a/sys/boot/sparc64/Makefile.inc b/sys/boot/sparc64/Makefile.inc
index ef5a7cee7413..a12699c3a6f7 100644
--- a/sys/boot/sparc64/Makefile.inc
+++ b/sys/boot/sparc64/Makefile.inc
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-BINDIR?=	/boot
 CFLAGS+=	-ffreestanding
 LDFLAGS+=	-nostdlib