Date: Wed, 25 Oct 2017 15:27:53 +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: r324980 - head/sys/boot/arm/uboot Message-ID: <201710251527.v9PFRrTv017951@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Wed Oct 25 15:27:53 2017 New Revision: 324980 URL: https://svnweb.freebsd.org/changeset/base/324980 Log: Use BOOTDIR consistently. We need to include bsd.init.mk early to make this happen. This will cause src.opts.mk to be included, so remove that. This needs to propigate through the sys/boot tree. Sponsored by: Netflix Modified: head/sys/boot/arm/uboot/Makefile Modified: head/sys/boot/arm/uboot/Makefile ============================================================================== --- head/sys/boot/arm/uboot/Makefile Wed Oct 25 15:27:48 2017 (r324979) +++ head/sys/boot/arm/uboot/Makefile Wed Oct 25 15:27:53 2017 (r324980) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <src.opts.mk> +.include <bsd.init.mk> FILES= ubldr ubldr.bin @@ -31,7 +31,7 @@ LOADER_BZIP2_SUPPORT?= no LOADER_FDT_SUPPORT= ${MK_FDT} # Always add MI sources -.include "../../loader.mk" +.include "${BOOTSRC}/loader.mk" CFLAGS+= -I. CLEANFILES+= loader.help @@ -42,7 +42,7 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.${MA LDFLAGS+= -Wl,-znotext # Pull in common loader code -.include "../../uboot.mk" +.include "${BOOTSRC}/uboot.mk" CFLAGS+= -fPIC @@ -51,7 +51,7 @@ LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FD OBJS+= ${SRCS:N*.h:R:S/$/.o/g} -loader.help: help.common help.uboot ${.CURDIR}/../../fdt/help.fdt +loader.help: help.common help.uboot ${BOOTSRC}/fdt/help.fdt cat ${.ALLSRC} | \ awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} @@ -75,8 +75,8 @@ ubldr.bin: ubldr.pie CLEANFILES+= ldscript.abs ldscript.pie ubldr ubldr.pie ubldr.bin .if !defined(LOADER_ONLY) -.PATH: ${.CURDIR}/../../forth -.include "${.CURDIR}/../../forth/Makefile.inc" +.PATH: ${BOOTSRC}/forth +.include "${BOOTSRC}/forth/Makefile.inc" # Install loader.rc. FILES+= loader.rc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710251527.v9PFRrTv017951>