From f86dd9968654db056447f7ee0de165b6ab676c54 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 1 Mar 2018 19:50:55 +0000 Subject: [PATCH] Create LOADER_UBOOT, and LOADER_OFW. Move these options out of Makefile.${MACHINE_ARCH} and remove the now-empty files. Generate the *32 directories on the necessary architectures (well, currently only amd64) on the fly. Remove LOADER_EFI variable and co-locate it with EFI. Differential Review: https://reviews.freebsd.org/D14546 --- share/mk/src.opts.mk | 18 +++++++++++++++-- stand/Makefile | 45 ++++++++++++++++++++++++++++-------------- stand/Makefile.amd64 | 20 ++----------------- stand/Makefile.arm | 10 ---------- stand/Makefile.arm64 | 8 -------- stand/Makefile.i386 | 8 -------- stand/Makefile.mips | 7 ------- stand/Makefile.powerpc | 8 -------- stand/Makefile.sparc64 | 6 ------ 9 files changed, 48 insertions(+), 82 deletions(-) delete mode 100644 stand/Makefile.arm delete mode 100644 stand/Makefile.arm64 delete mode 100644 stand/Makefile.i386 delete mode 100644 stand/Makefile.mips delete mode 100644 stand/Makefile.powerpc delete mode 100644 stand/Makefile.sparc64 diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 3392628968c0..d8b9003d1779 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -134,8 +134,9 @@ __DEFAULT_YES_OPTIONS = \ LPR \ LS_COLORS \ LZMA_SUPPORT \ - LOADER_EFI \ LOADER_GELI \ + LOADER_OFW \ + LOADER_UBOOT \ MAIL \ MAILWRAPPER \ MAKE \ @@ -297,8 +298,21 @@ 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 LOADER_EFI +BROKEN_OPTIONS+=EFI .endif +# GELI isn't supported on !x86 +.if ${__T} != "i386" && ${__T} != "amd64" +BROKEN_OPTIONS+=LOADER_GELI +.endif +# OFW is only for powerpc and sparc64, exclude others +.if ${__T:Mpowerpc*} == "" && ${__T:Msparc64} == "" +BROKEN_OPTIONS+=LOADER_OFW +.endif +# UBOOT is only for arm, mips and powerpc, exclude others +.if ${__T:Marm*} == "" && ${__T:Mmips*} == "" && ${__T:Mpowerpc*} == "" +BROKEN_OPTIONS+=LOADER_UBOOT +.endif + .if ${__T:Mmips64*} # profiling won't work on MIPS64 because there is only assembly for o32 BROKEN_OPTIONS+=PROFILE diff --git a/stand/Makefile b/stand/Makefile index a22d771acb68..59eb324a8258 100644 --- a/stand/Makefile +++ b/stand/Makefile @@ -2,28 +2,43 @@ .include -SUBDIR+= libsa -.if ${MK_FORTH} != "no" -# Build the add-in FORTH interpreter. -SUBDIR+= ficl -SUBDIR+= forth -.endif -.if ${MK_LOADER_LUA} != "no" -SUBDIR+= liblua -SUBDIR+= lua +# For amd64 we have to build 32 and 64 bit versions of things. For +# others we don't. LIB32LIST is a list of libraries, which if +# included, need to be built 32-bit as well. +.if ${MACHINE_ARCH} == "amd64" +LIB32LIST=libsa ficl liblua zfs .endif -SUBDIR+= defaults -SUBDIR+= man +S.yes+= libsa + +S.${MK_FORTH}+= ficl +S.${MK_FORTH}+= forth +S.${MK_LOADER_LUA}+= liblua +S.${MK_LOADER_LUA}+= lua +S.${MK_FDT}+= fdt +S.${MK_LOADER_OFW}+= ofw +S.${MK_ZFS}+= zfs +S.yes+= defaults +S.yes+= man + +S.${MK_LOADER_GELI}+= geli .include -.if ${MK_EFI} != "no" && ${MK_LOADER_EFI} != "no" -SUBDIR+= efi -.endif +S.${MK_EFI}+= efi +S.${MK_LOADER_UBOOT}+= uboot .if exists(${.CURDIR}/${MACHINE}/.) -SUBDIR+= ${MACHINE} +S.yes+= ${MACHINE} .endif +# Build the actual subdir list from S.yes, adding in the 32-bit +# variant if necessary. +.for _x in ${S.yes} +SUBDIR+=${_x} +.if defined(LIB32LIST) && ${LIB32LIST:M${_x}} +SUBDIR+=${_x}32 +.endif +.endfor + .include diff --git a/stand/Makefile.amd64 b/stand/Makefile.amd64 index 3ae816158168..b2b918ebed5b 100644 --- a/stand/Makefile.amd64 +++ b/stand/Makefile.amd64 @@ -1,20 +1,4 @@ # $FreeBSD$ -SUBDIR+= libsa32 -.if ${MK_ZFS} != "no" -SUBDIR+= zfs zfs32 -.endif -.if ${MK_FORTH} != "no" -SUBDIR+= ficl32 -.endif -.if ${MK_LOADER_LUA} != "no" -SUBDIR+= liblua32 -.endif - -SUBDIR+= userboot - -.if ${MK_LOADER_GELI} == "yes" -SUBDIR+= geli -.endif - -SUBDIR+= i386 +S.yes+= userboot +S.yes+= i386 diff --git a/stand/Makefile.arm b/stand/Makefile.arm deleted file mode 100644 index afd3319e48a1..000000000000 --- a/stand/Makefile.arm +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -.if ${MK_FDT} != "no" -SUBDIR+= fdt -.endif -.if ${MK_ZFS} != "no" -SUBDIR+= zfs -.endif - -SUBDIR+= uboot diff --git a/stand/Makefile.arm64 b/stand/Makefile.arm64 deleted file mode 100644 index e3bf756bd745..000000000000 --- a/stand/Makefile.arm64 +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -.if ${MK_FDT} != "no" -SUBDIR+= fdt -.endif -.if ${MK_ZFS} != "no" -SUBDIR+= zfs -.endif diff --git a/stand/Makefile.i386 b/stand/Makefile.i386 deleted file mode 100644 index 1936f593da3f..000000000000 --- a/stand/Makefile.i386 +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -.if ${MK_LOADER_GELI} == "yes" -SUBDIR+= geli -.endif -.if ${MK_ZFS} != "no" -SUBDIR+= zfs -.endif diff --git a/stand/Makefile.mips b/stand/Makefile.mips deleted file mode 100644 index 46fc5742fbf6..000000000000 --- a/stand/Makefile.mips +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -.if ${MK_FDT} != "no" -SUBDIR+= fdt -.endif - -SUBDIR+= uboot diff --git a/stand/Makefile.powerpc b/stand/Makefile.powerpc deleted file mode 100644 index b7660f4600d4..000000000000 --- a/stand/Makefile.powerpc +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -.if ${MK_FDT} != "no" -SUBDIR+= fdt -.endif - -SUBDIR+= ofw -SUBDIR+= uboot diff --git a/stand/Makefile.sparc64 b/stand/Makefile.sparc64 deleted file mode 100644 index 40b42e9c18e1..000000000000 --- a/stand/Makefile.sparc64 +++ /dev/null @@ -1,6 +0,0 @@ -# $FreeBSD$ - -SUBDIR+= ofw -.if ${MK_ZFS} != "no" -SUBDIR+= zfs -.endif