From owner-svn-src-head@freebsd.org  Mon Oct 16 03:59:40 2017
Return-Path: <owner-svn-src-head@freebsd.org>
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 0A390E2CE22;
 Mon, 16 Oct 2017 03:59:40 +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 BDF846ACD3;
 Mon, 16 Oct 2017 03:59:39 +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 v9G3xcGc087865;
 Mon, 16 Oct 2017 03:59:38 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9G3xcfi087861;
 Mon, 16 Oct 2017 03:59:38 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201710160359.v9G3xcfi087861@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 16 Oct 2017 03:59:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324651 - head/sys/boot
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/sys/boot
X-SVN-Commit-Revision: 324651
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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Oct 2017 03:59:40 -0000

Author: imp
Date: Mon Oct 16 03:59:38 2017
New Revision: 324651
URL: https://svnweb.freebsd.org/changeset/base/324651

Log:
  create defs.mk for common definitions

Added:
  head/sys/boot/defs.mk   (contents, props changed)
Modified:
  head/sys/boot/Makefile.inc
  head/sys/boot/ficl.mk
  head/sys/boot/loader.mk

Modified: head/sys/boot/Makefile.inc
==============================================================================
--- head/sys/boot/Makefile.inc	Mon Oct 16 03:59:33 2017	(r324650)
+++ head/sys/boot/Makefile.inc	Mon Oct 16 03:59:38 2017	(r324651)
@@ -2,14 +2,10 @@
 
 .include <src.opts.mk>
 
+.include "defs.mk"
+
 .if !defined(__BOOT_MAKEFILE_INC__)
 __BOOT_MAKEFILE_INC__=${MFILE}
-
-SASRC=${SRCTOP}/sys/boot/libsa
-# Normal Standalone library
-LIBSA=${OBJTOP}/sys/boot/libsa/libsa.a
-# Standalone library compiled for 32-bit version of the processor
-LIBSA32=${OBJTOP}/sys/boot/libsa32/libsa32.a
 
 CFLAGS+=-I${SASRC}
 

Added: head/sys/boot/defs.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/boot/defs.mk	Mon Oct 16 03:59:38 2017	(r324651)
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+.if !defined(__BOOT_DEFS_MK__)
+__BOOT_DEFS_MK__=${MFILE}
+
+BOOTDIR=	${SRCTOP}/sys/boot
+FICLDIR=	${SRCTOP}/sys/boot/ficl
+LDR_MI=		${BOOTDIR}/common
+SASRC=		${SRCTOP}/sys/boot/libsa
+SYSDIR=		${SRCTOP}/sys
+
+# Normal Standalone library
+LIBSA=		${OBJTOP}/sys/boot/libsa/libsa.a
+# Standalone library compiled for 32-bit version of the processor
+LIBSA32=	${OBJTOP}/sys/boot/libsa32/libsa32.a
+
+.endif # __BOOT_DEFS_MK__

Modified: head/sys/boot/ficl.mk
==============================================================================
--- head/sys/boot/ficl.mk	Mon Oct 16 03:59:33 2017	(r324650)
+++ head/sys/boot/ficl.mk	Mon Oct 16 03:59:38 2017	(r324651)
@@ -2,7 +2,7 @@
 
 # Common flags to build FICL related files
 
-FICLDIR?=	${SRCTOP}/sys/boot/ficl
+.include "defs.mk"
 
 .if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32)
 FICL_CPUARCH=	i386
@@ -26,7 +26,7 @@ CFLAGS+=	-fPIC
 CFLAGS+=	-m32 -mcpu=powerpc -I.
 .endif
 
-CFLAGS+=	-I${FICLDIR} -I${FICLDIR}/${FICL_CPUARCH} -I${SRCTOP}/sys/boot/common
+CFLAGS+=	-I${FICLDIR} -I${FICLDIR}/${FICL_CPUARCH} -I${LDR_MI}
 
 .if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32)
 .if !exists(machine)

Modified: head/sys/boot/loader.mk
==============================================================================
--- head/sys/boot/loader.mk	Mon Oct 16 03:59:33 2017	(r324650)
+++ head/sys/boot/loader.mk	Mon Oct 16 03:59:38 2017	(r324651)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
-BOOTDIR=${SRCTOP}/sys/boot
-LDR_MI=${BOOTDIR}/common
+.include "defs.mk"
 
 .PATH: ${LDR_MI} ${BOOTDIR}/libsa