From nobody Fri Sep 20 14:59:16 2024 X-Original-To: dev-commits-src-main@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 4X9FsJ6JJkz5XT6Y; Fri, 20 Sep 2024 14:59:16 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X9FsJ5kzfz4NQL; Fri, 20 Sep 2024 14:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726844356; 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=hWupKmhI2fh8/ktarGettIikORqhhLTFZa7wsv0qXBI=; b=CPqhbanMkp9U2bFA0jGOE92kKomV5FXh+PwSER9avnpsY69YD8wU90XMoiRRoY32XtoJWK gsJkJjINg3shET83HRZupNyMpbH72q3mV/NaAYo7ehT+xD1BW3/cqxV+OkEICAW/5e102I SjSiTrVzUiv+AOAQEZhQpd0bmA3hlOSD+SmitfBnPg199JTG5MGygUVqFjbeQ6zFuNLzrL R9rY6TmwBtmydCzJsXBUrzMPvgld3tFdkjxBR9Ke/p0/9fcnZ6fi90x7x3rVKdgm4sfxNA D5HZxzMqpm68dfpRTA+q0n/8YughMK3l5URo0iBkxBTgy0RyA0UF0dJX+a3E1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726844356; a=rsa-sha256; cv=none; b=LsGXLsBNp/reYOevX1UpxxymNmqJjlDAEKu1CGtqo3ZAGrz4Xo0d54BHENzjQFJisGpUq6 YBRSVyhM9O6fn5z2Fj9hMri57DIq5m/4DO5mgsezNCHi/GtUP4GvVTVPNSmpkXmR/3txR6 pu2ltn9TaPEm3yDg1ZAzY86Rvf/ULYyU90Teto0hGSlK2OGIuUteuq5c3KLVTD5vDZ1J0m UpDbOMCf/Xy7FO3X7MbbB7zeiuOg8xtpGGDHspLvwdoh4OG5dR6QBKc/WLzWJuw6bzNiCp XyH3fbOStGeC1lv4rpyb7YIXlNhHdk/Iiq+Db0SKR/FCEWE5SbaVE98OLsAV1w== 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=1726844356; 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=hWupKmhI2fh8/ktarGettIikORqhhLTFZa7wsv0qXBI=; b=cA06dhCrmMUaswXnjKYjuoy/Dthi1QXtFp/RoHC68ofGSwKFml2BAh+bOVk8IwtmS+LB+J CqNVUH3KUHoycJaCgyKQTD3wRuYZwnkkE1UULmHK3zancrlUyLiJAkUDydnMgyB2FFjPMJ dQHQAprF+NHfKiFZZJBIlm7GE7+Xfr9I/mYLsUvVr6tXQL1SfZxWQkc+c9q8NLvar5j/vs YvF9fGtWq4ouC9760DH4OGe91CcyB0x0/FrHGxArkbTj9nnIuwF5nkpl4LKBASgvrZ2Rmo 6vVS0/fZ8ughdi5iY+a4HG8WUrA1irWJH8aMOCbIXxXWMM1Yd0++81G0PV6ERg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X9FsJ5Fmpzv3t; Fri, 20 Sep 2024 14:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48KExGgF046571; Fri, 20 Sep 2024 14:59:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48KExGxi046568; Fri, 20 Sep 2024 14:59:16 GMT (envelope-from git) Date: Fri, 20 Sep 2024 14:59:16 GMT Message-Id: <202409201459.48KExGxi046568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fe3f792f9a29 - main - Add build option for the ia32 loader List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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: fe3f792f9a2982678138e239f5e8d66e8ee71aeb Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fe3f792f9a2982678138e239f5e8d66e8ee71aeb commit fe3f792f9a2982678138e239f5e8d66e8ee71aeb Author: Ahmad Khalifa AuthorDate: 2024-05-14 19:27:06 +0000 Commit: Warner Losh CommitDate: 2024-09-20 14:45:05 +0000 Add build option for the ia32 loader In preparation for supporting 64-bit machines with 32-bit UEFI firmware, add a build option for compiling the ia32 loader. Currently unused. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1098 --- share/mk/src.opts.mk | 5 +++++ tools/build/options/WITHOUT_LOADER_IA32 | 1 + tools/build/options/WITH_LOADER_IA32 | 1 + 3 files changed, 7 insertions(+) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 179b444a8ec7..f9d94ab663b0 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -132,6 +132,7 @@ __DEFAULT_YES_OPTIONS = \ LOADER_OFW \ LOADER_PXEBOOT \ LOADER_UBOOT \ + LOADER_IA32 \ LOCALES \ LOCATE \ LPR \ @@ -330,6 +331,10 @@ BROKEN_OPTIONS+=LOADER_KBOOT .if (${__T:Marm*} == "" && ${__T:Mpowerpc*} == "") || ${__T} == "powerpc64le" BROKEN_OPTIONS+=LOADER_UBOOT .endif +# The 32-bit UEFI loader is only for amd64 +.if ${__T} != "amd64" +BROKEN_OPTIONS+=LOADER_IA32 +.endif # GELI and Lua in loader currently cause boot failures on powerpc. # Further debugging is required -- probably they are just broken on big # endian systems generically (they jump to null pointers or try to read diff --git a/tools/build/options/WITHOUT_LOADER_IA32 b/tools/build/options/WITHOUT_LOADER_IA32 new file mode 100644 index 000000000000..2df947216b8f --- /dev/null +++ b/tools/build/options/WITHOUT_LOADER_IA32 @@ -0,0 +1 @@ +Do not build the 32-bit UEFI loader. diff --git a/tools/build/options/WITH_LOADER_IA32 b/tools/build/options/WITH_LOADER_IA32 new file mode 100644 index 000000000000..2030619dbb85 --- /dev/null +++ b/tools/build/options/WITH_LOADER_IA32 @@ -0,0 +1 @@ +Build the 32-bit UEFI loader.