From owner-svn-src-head@freebsd.org Tue Feb 27 17:35:30 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6EA0FF39B1A; Tue, 27 Feb 2018 17:35:30 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 20AB284DDE; Tue, 27 Feb 2018 17:35:30 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1BA295C43; Tue, 27 Feb 2018 17:35:30 +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 w1RHZTMY002326; Tue, 27 Feb 2018 17:35:29 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1RHZT4q002319; Tue, 27 Feb 2018 17:35:29 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201802271735.w1RHZT4q002319@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 27 Feb 2018 17:35:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r330077 - in head: share/mk stand stand/efi X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head: share/mk stand stand/efi X-SVN-Commit-Revision: 330077 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.25 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: Tue, 27 Feb 2018 17:35:30 -0000 Author: imp Date: Tue Feb 27 17:35:29 2018 New Revision: 330077 URL: https://svnweb.freebsd.org/changeset/base/330077 Log: Move EFI up to common makefile. There's no need for all these .if's based on architecture. Sponsored by: Netflix Modified: head/share/mk/src.opts.mk head/stand/Makefile head/stand/Makefile.amd64 head/stand/Makefile.arm head/stand/Makefile.arm64 head/stand/Makefile.i386 head/stand/efi/Makefile Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Tue Feb 27 17:12:33 2018 (r330076) +++ head/share/mk/src.opts.mk Tue Feb 27 17:35:29 2018 (r330077) @@ -125,6 +125,7 @@ __DEFAULT_YES_OPTIONS = \ LPR \ LS_COLORS \ LZMA_SUPPORT \ + LOADER_EFI \ LOADER_GELI \ MAIL \ MAILWRAPPER \ @@ -285,8 +286,9 @@ BROKEN_OPTIONS+=LIBSOFT .if ${__T:Mmips*} BROKEN_OPTIONS+=SSP .endif +# EFI doesn't exist on mips, powerpc, sparc or riscv. .if ${__T:Mmips*} || ${__T:Mpowerpc*} || ${__T:Msparc64} || ${__T:Mriscv*} -BROKEN_OPTIONS+=EFI +BROKEN_OPTIONS+=EFI LOADER_EFI .endif .if ${__T:Mmips64*} # profiling won't work on MIPS64 because there is only assembly for o32 Modified: head/stand/Makefile ============================================================================== --- head/stand/Makefile Tue Feb 27 17:12:33 2018 (r330076) +++ head/stand/Makefile Tue Feb 27 17:35:29 2018 (r330077) @@ -18,6 +18,10 @@ SUBDIR+= man .include +.if ${MK_EFI} != "no" && ${MK_LOADER_EFI} != "no" +SUBDIR+= efi +.endif + .if exists(${.CURDIR}/${MACHINE}/.) SUBDIR+= ${MACHINE} .endif Modified: head/stand/Makefile.amd64 ============================================================================== --- head/stand/Makefile.amd64 Tue Feb 27 17:12:33 2018 (r330076) +++ head/stand/Makefile.amd64 Tue Feb 27 17:35:29 2018 (r330077) @@ -11,7 +11,6 @@ SUBDIR+= ficl32 SUBDIR+= liblua32 .endif -SUBDIR+= efi SUBDIR+= userboot .if ${MK_LOADER_GELI} == "yes" Modified: head/stand/Makefile.arm ============================================================================== --- head/stand/Makefile.arm Tue Feb 27 17:12:33 2018 (r330076) +++ head/stand/Makefile.arm Tue Feb 27 17:35:29 2018 (r330077) @@ -7,4 +7,4 @@ SUBDIR+= fdt SUBDIR+= zfs .endif -SUBDIR+= efi uboot +SUBDIR+= uboot Modified: head/stand/Makefile.arm64 ============================================================================== --- head/stand/Makefile.arm64 Tue Feb 27 17:12:33 2018 (r330076) +++ head/stand/Makefile.arm64 Tue Feb 27 17:35:29 2018 (r330077) @@ -6,5 +6,3 @@ SUBDIR+= fdt .if ${MK_ZFS} != "no" SUBDIR+= zfs .endif - -SUBDIR+= efi Modified: head/stand/Makefile.i386 ============================================================================== --- head/stand/Makefile.i386 Tue Feb 27 17:12:33 2018 (r330076) +++ head/stand/Makefile.i386 Tue Feb 27 17:35:29 2018 (r330077) @@ -6,5 +6,3 @@ SUBDIR+= geli .if ${MK_ZFS} != "no" SUBDIR+= zfs .endif - -SUBDIR+= efi Modified: head/stand/efi/Makefile ============================================================================== --- head/stand/efi/Makefile Tue Feb 27 17:12:33 2018 (r330076) +++ head/stand/efi/Makefile Tue Feb 27 17:35:29 2018 (r330077) @@ -8,17 +8,11 @@ NO_OBJ=t # than 4.5 supports it. .if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" .if ${MK_FDT} != "no" SUBDIR+= fdt .endif -.endif -.if ${MACHINE_CPUARCH} == "aarch64" || \ - ${MACHINE_CPUARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "arm" SUBDIR+= libefi loader boot1 -.endif .endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500