From nobody Fri Jul 10 04:18:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gxJVZ0gtXz6kRMm for ; Fri, 10 Jul 2026 04:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gxJVY5j2Gz3blp for ; Fri, 10 Jul 2026 04:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783657125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0GOsWYzRSMnQ1JNHHKSzSAk5kPJtlKSINXYhN0E6oSk=; b=Xm/0OjqQW5aqopr/TjpNVKJ2dPEtrjP8B1vQqOq+2H4DY0hljiIDYoXVj783WwK51NMmMw DfjqAZXf2a+uQPDEP/podIpxvyyStyy9NjCIaIaJSNYNvTIO7trvkK8IK0WEg6mhiLLJKW yakHZfYdEiP9gmylhvM0jUYKmVyWvF9QopQp65fzABEnzYjG2wNR2lQgla5pbbOOfYrtmf msX/E/qI7KR4bQmi9aYQ0bsRPd9ml5Vl8jsA13s6wRB1HOf9iaVm1bb9CRSWla+3/m2q8W TPJ7lED0gZwnDnQJ2HpcJ3sXjaRBQXQ6cd7se+hEpc7/X9ap6dDtZgE0fgRByw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783657125; a=rsa-sha256; cv=none; b=f140Dtirlypk8v/Nhx8P4ZsSygyoSSrTsvSAZ5356+HC9OynNgP0PR+TnIplASooWBgzrl 5WRJ5LzhTNdLJOj0CaPckC1xlE9y/8agODyJBm2U8zzVvcJDys0DQyA5S4bI3oL8z4WNhj AFetLyzbHdcBRVQaufrKXdpMnB1jF9fuX4Lh/Wvsdto7XJOlv/hjlYMsjb2pHwPkz5I5MX qfWw3H3Wwqgu3aneUcBHQTkxL3ucqRP/3d6zxDTLoIf4eVcI3YClpU/hBvrT3+tBzDikHM luWxr15z52hTQnwnykskARi7Z5k8K2YnWjanepwtlrz2IRkoOkK82ReW4hxp1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783657125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0GOsWYzRSMnQ1JNHHKSzSAk5kPJtlKSINXYhN0E6oSk=; b=thIG5BRJBiz0nnqGrNcpZvkbleN7kH4aHKuOcq+n0hB/+zzBAgiQjvu+AlNbS2iNITToao yqGgdfOqtfdjGDIjHZbf+/e/vPjEgUrHpFpjUGINZVwqnZibxofVR4uNU4Dt12jFrLV+gt bzWP+W/vOegBA7dFMj5nJ0HgcxSJTsncQzEP7rItycZ8ttFh0ZjEnyOoOHMQSMdFvwWljZ spMmX8GtedVSMCv0G+XEnuJsISmFFa55d366wS7ffOFk52XoOjrgZ34RhoK2S2qudFarzB Ym35q2PRhpnU4h/LDG5Cx3YJeCMadmKXypRH602Gc5jfxWqFRM3iecpiXSvRgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gxJVY4HsWzg3f for ; Fri, 10 Jul 2026 04:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34179 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Jul 2026 04:18:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: bcb1b157fdf9 - main - loader: Add two new build knobs for x86 BIOS loaders List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcb1b157fdf97d5296457a0a95dfc04e33c2faeb Auto-Submitted: auto-generated Date: Fri, 10 Jul 2026 04:18:45 +0000 Message-Id: <6a5072a5.34179.450975cf@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bcb1b157fdf97d5296457a0a95dfc04e33c2faeb commit bcb1b157fdf97d5296457a0a95dfc04e33c2faeb Author: Warner Losh AuthorDate: 2026-07-10 04:05:25 +0000 Commit: Warner Losh CommitDate: 2026-07-10 04:13:07 +0000 loader: Add two new build knobs for x86 BIOS loaders We have two sets of BIOS loaders: One that lives in stand/i386 and one that lives in stand/userboot. Add knows to turn these on/off, with the default being on. These often aren't needed when creating a minimal UEFI system, so add knobs to turn them off. Given light-weight VMs have created a new use cases for these loaders, there's no plans at all to eliminate them. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D58072 --- share/man/man5/src.conf.5 | 8 +++++++- share/mk/src.opts.mk | 2 ++ stand/Makefile.amd64 | 4 ++-- tools/build/options/WITHOUT_LOADER_BIOS | 2 ++ tools/build/options/WITHOUT_LOADER_USERBOOT | 2 ++ tools/build/options/WITH_LOADER_BIOS | 2 ++ tools/build/options/WITH_LOADER_USERBOOT | 2 ++ 7 files changed, 19 insertions(+), 3 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 03c43bed733c..b1c511f596ef 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd July 7, 2026 +.Dd July 9, 2026 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1065,6 +1065,9 @@ Do not build LLVM target support for X86. The .Va LLVM_TARGET_ALL option should be used rather than this in most cases. +.It Va WITHOUT_LOADER_BIOS +Do not build x86 BIOS loader support + .It Va WITHOUT_LOADER_BIOS_TEXTONLY Include graphics, font and video mode support in the i386 and amd64 BIOS boot loader. @@ -1146,6 +1149,9 @@ arm/armv7 and powerpc/powerpc64. .It Va WITH_LOADER_USB Build the usb/kshim library +.It Va WITHOUT_LOADER_USERBOOT +Do not build x86 userboot loader support + .It Va WITH_LOADER_VERBOSE Build with extra verbose debugging in the loader. May explode already nearly too large loader over the limit. diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 1b5a44c231f3..1dbd1d2d9703 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -125,6 +125,7 @@ __DEFAULT_YES_OPTIONS = \ LLVM_BINUTILS \ LLVM_BINUTILS_BOOTSTRAP \ LLVM_COV \ + LOADER_BIOS \ LOADER_BIOS_TEXTONLY \ LOADER_GELI \ LOADER_IA32 \ @@ -133,6 +134,7 @@ __DEFAULT_YES_OPTIONS = \ LOADER_OFW \ LOADER_PXEBOOT \ LOADER_UBOOT \ + LOADER_USERBOOT \ LOADER_ZFS \ LOCALES \ LOCATE \ diff --git a/stand/Makefile.amd64 b/stand/Makefile.amd64 index 48e5136ec33f..1a19dd76ba46 100644 --- a/stand/Makefile.amd64 +++ b/stand/Makefile.amd64 @@ -1,5 +1,5 @@ -S.yes+= userboot -S.yes+= i386 +S.${MK_LOADER_USERBOOT}+= userboot +S.${MK_LOADER_BIOS}+= i386 SUBDIR_DEPEND_userboot+= ${INTERP_DEPENDS} # These won't get tacked on in an amd64 build diff --git a/tools/build/options/WITHOUT_LOADER_BIOS b/tools/build/options/WITHOUT_LOADER_BIOS new file mode 100644 index 000000000000..702d33340d56 --- /dev/null +++ b/tools/build/options/WITHOUT_LOADER_BIOS @@ -0,0 +1,2 @@ +Do not build x86 BIOS loader support + diff --git a/tools/build/options/WITHOUT_LOADER_USERBOOT b/tools/build/options/WITHOUT_LOADER_USERBOOT new file mode 100644 index 000000000000..3a9c755306b9 --- /dev/null +++ b/tools/build/options/WITHOUT_LOADER_USERBOOT @@ -0,0 +1,2 @@ +Do not build x86 userboot loader support + diff --git a/tools/build/options/WITH_LOADER_BIOS b/tools/build/options/WITH_LOADER_BIOS new file mode 100644 index 000000000000..c876ddaddb20 --- /dev/null +++ b/tools/build/options/WITH_LOADER_BIOS @@ -0,0 +1,2 @@ +Build x86 BIOS loader support + diff --git a/tools/build/options/WITH_LOADER_USERBOOT b/tools/build/options/WITH_LOADER_USERBOOT new file mode 100644 index 000000000000..363facc112ec --- /dev/null +++ b/tools/build/options/WITH_LOADER_USERBOOT @@ -0,0 +1,2 @@ +Build x86 userboot loader support +