From owner-svn-src-head@freebsd.org Wed Oct 25 15:27:54 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 520FFE4D522; Wed, 25 Oct 2017 15:27:54 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1F7FA71A4F; Wed, 25 Oct 2017 15:27:54 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9PFRreq017952; Wed, 25 Oct 2017 15:27:53 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9PFRrTv017951; Wed, 25 Oct 2017 15:27:53 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710251527.v9PFRrTv017951@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 25 Oct 2017 15:27:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324980 - head/sys/boot/arm/uboot X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/boot/arm/uboot X-SVN-Commit-Revision: 324980 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Oct 2017 15:27:54 -0000 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 +.include 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