Date: Wed, 25 Oct 2017 15:27:59 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324981 - in head/sys/boot: . arm/uboot efi i386 mips/beri mips/beri/boot2 mips/uboot powerpc/boot1.chrp powerpc/kboot powerpc/ofw powerpc/ps3 powerpc/uboot sparc64 Message-ID: <201710251527.v9PFRxIM018005@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Wed Oct 25 15:27:58 2017 New Revision: 324981 URL: https://svnweb.freebsd.org/changeset/base/324981 Log: 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 Modified: head/sys/boot/arm/uboot/Makefile head/sys/boot/defs.mk head/sys/boot/efi/Makefile.inc head/sys/boot/i386/Makefile.inc head/sys/boot/mips/beri/Makefile.inc head/sys/boot/mips/beri/boot2/Makefile head/sys/boot/mips/uboot/Makefile head/sys/boot/powerpc/boot1.chrp/Makefile head/sys/boot/powerpc/kboot/Makefile head/sys/boot/powerpc/ofw/Makefile head/sys/boot/powerpc/ps3/Makefile head/sys/boot/powerpc/uboot/Makefile head/sys/boot/sparc64/Makefile.inc Modified: head/sys/boot/arm/uboot/Makefile ============================================================================== --- head/sys/boot/arm/uboot/Makefile Wed Oct 25 15:27:53 2017 (r324980) +++ head/sys/boot/arm/uboot/Makefile Wed Oct 25 15:27:58 2017 (r324981) @@ -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. Modified: head/sys/boot/defs.mk ============================================================================== --- head/sys/boot/defs.mk Wed Oct 25 15:27:53 2017 (r324980) +++ head/sys/boot/defs.mk Wed Oct 25 15:27:58 2017 (r324981) @@ -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 Modified: head/sys/boot/efi/Makefile.inc ============================================================================== --- head/sys/boot/efi/Makefile.inc Wed Oct 25 15:27:53 2017 (r324980) +++ head/sys/boot/efi/Makefile.inc Wed Oct 25 15:27:58 2017 (r324981) @@ -1,7 +1,5 @@ # $FreeBSD$ -BINDIR?= /boot - .if ${MACHINE_CPUARCH} == "i386" CFLAGS+= -march=i386 CFLAGS+= -mno-aes Modified: head/sys/boot/i386/Makefile.inc ============================================================================== --- head/sys/boot/i386/Makefile.inc Wed Oct 25 15:27:53 2017 (r324980) +++ head/sys/boot/i386/Makefile.inc Wed Oct 25 15:27:58 2017 (r324981) @@ -2,8 +2,6 @@ # # $FreeBSD$ -BINDIR?= /boot - LOADER_ADDRESS?=0x200000 CFLAGS+= -march=i386 -ffreestanding CFLAGS.gcc+= -mpreferred-stack-boundary=2 Modified: head/sys/boot/mips/beri/Makefile.inc ============================================================================== --- head/sys/boot/mips/beri/Makefile.inc Wed Oct 25 15:27:53 2017 (r324980) +++ head/sys/boot/mips/beri/Makefile.inc Wed Oct 25 15:27:58 2017 (r324981) @@ -1,6 +1,5 @@ # $FreeBSD$ -BINDIR?= /boot CFLAGS+= -ffreestanding LDFLAGS+= -nostdlib Modified: head/sys/boot/mips/beri/boot2/Makefile ============================================================================== --- head/sys/boot/mips/beri/boot2/Makefile Wed Oct 25 15:27:53 2017 (r324980) +++ head/sys/boot/mips/beri/boot2/Makefile Wed Oct 25 15:27:58 2017 (r324981) @@ -29,7 +29,6 @@ # # $FreeBSD$ -BINDIR?= /boot INSTALLFLAGS= -b LOADERS= flashboot jtagboot Modified: head/sys/boot/mips/uboot/Makefile ============================================================================== --- head/sys/boot/mips/uboot/Makefile Wed Oct 25 15:27:53 2017 (r324980) +++ head/sys/boot/mips/uboot/Makefile Wed Oct 25 15:27:58 2017 (r324981) @@ -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. Modified: head/sys/boot/powerpc/boot1.chrp/Makefile ============================================================================== --- head/sys/boot/powerpc/boot1.chrp/Makefile Wed Oct 25 15:27:53 2017 (r324980) +++ head/sys/boot/powerpc/boot1.chrp/Makefile Wed Oct 25 15:27:58 2017 (r324981) @@ -4,7 +4,6 @@ SSP_CFLAGS= PROG= boot1.elf NEWVERSWHAT= "Open Firmware boot block" ${MACHINE_ARCH} -BINDIR?= /boot INSTALLFLAGS= -b FILES= boot1.hfs Modified: head/sys/boot/powerpc/kboot/Makefile ============================================================================== --- head/sys/boot/powerpc/kboot/Makefile Wed Oct 25 15:27:53 2017 (r324980) +++ head/sys/boot/powerpc/kboot/Makefile Wed Oct 25 15:27:58 2017 (r324981) @@ -6,7 +6,6 @@ MAN= PROG= loader.kboot NEWVERSWHAT= "kboot loader" ${MACHINE_ARCH} -BINDIR?= /boot INSTALLFLAGS= -b # Architecture-specific loader code Modified: head/sys/boot/powerpc/ofw/Makefile ============================================================================== --- head/sys/boot/powerpc/ofw/Makefile Wed Oct 25 15:27:53 2017 (r324980) +++ head/sys/boot/powerpc/ofw/Makefile Wed Oct 25 15:27:58 2017 (r324981) @@ -6,7 +6,6 @@ MAN= PROG= loader NEWVERSWHAT= "Open Firmware loader" ${MACHINE_ARCH} -BINDIR?= /boot INSTALLFLAGS= -b # Architecture-specific loader code Modified: head/sys/boot/powerpc/ps3/Makefile ============================================================================== --- head/sys/boot/powerpc/ps3/Makefile Wed Oct 25 15:27:53 2017 (r324980) +++ head/sys/boot/powerpc/ps3/Makefile Wed Oct 25 15:27:58 2017 (r324981) @@ -6,7 +6,6 @@ MAN= PROG= loader.ps3 NEWVERSWHAT= "Playstation 3 loader" ${MACHINE_ARCH} -BINDIR?= /boot INSTALLFLAGS= -b # Architecture-specific loader code Modified: head/sys/boot/powerpc/uboot/Makefile ============================================================================== --- head/sys/boot/powerpc/uboot/Makefile Wed Oct 25 15:27:53 2017 (r324980) +++ head/sys/boot/powerpc/uboot/Makefile Wed Oct 25 15:27:58 2017 (r324981) @@ -4,7 +4,6 @@ PROG= ubldr NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH} -BINDIR?= /boot INSTALLFLAGS= -b MAN= Modified: head/sys/boot/sparc64/Makefile.inc ============================================================================== --- head/sys/boot/sparc64/Makefile.inc Wed Oct 25 15:27:53 2017 (r324980) +++ head/sys/boot/sparc64/Makefile.inc Wed Oct 25 15:27:58 2017 (r324981) @@ -1,6 +1,5 @@ # $FreeBSD$ -BINDIR?= /boot CFLAGS+= -ffreestanding LDFLAGS+= -nostdlib
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710251527.v9PFRxIM018005>