From nobody Mon Dec 15 17:00:07 2025 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 4dVRBc0JkVz6L1Mm for ; Mon, 15 Dec 2025 17:00:08 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVRBb2c2Sz3p3J for ; Mon, 15 Dec 2025 17:00:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818007; 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=zBDjoCw8D7d0cKqByc+aRge1UfokmzhVXRPVft3pABk=; b=tJBcddtvz5TYqkkU0LYlyizWTpc/x3uwqbM/6OgCYPoyO0TaQK1upD6gsbnU/dlm3r9X2H 3qdWla7+Xz3WxlKRqpLIYSAqDQ7iUyHj6uB+Jw+rZ8+8fw1WsPeJoMa4k1p4cq1gFxZYky wntjGgcSsjUsnSQ3uaAMUa4qZECjxwYJHzbXhCI5oTIHGtmhfJ+RZxflgPaA8obPs6wPkL 5Tjr72C2hF63czqfN55G950rA6h9YNGQDHJnvKR2mVYIKDbABUKYVTy4nfj3/t+EIb0Cz3 5V7fSQ+UPO+C3YmdiNWjVyz/Koy36KtVuFVi77xzOQzLwBE76CBw05GHAvMmfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818007; 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=zBDjoCw8D7d0cKqByc+aRge1UfokmzhVXRPVft3pABk=; b=GRzfDcq0XfbJUf2y5lNySpBwKECjBBVey3v7R8bCX8zlcosMlmvJV6UsxB0aJMHIw63Tqc w1lXaqhIt/O4ekEU2q/gftjinXr5ViY9oeF8dSJnvYHZiArN0y/X1FApJvJF05rK+nI1sn rQzWcA84OiLiKfz6zvzhy6j2Ct9FT0IRTncTfAc+LPSD5YcPeQ1OYMqBdGdS8aa67Hpz7d XRfZmQBBj5Mwjkzf0r05cpEHDD0E0IPMvhOZLsd8ZGVadrSIdLc9cxxiJ4gaNZvawNgIEN gRSTdzn3FtCDyfDwSVqnCP8MpFjLBI0SJM87m0vicp//0xsadOFA/SieVlphfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765818007; a=rsa-sha256; cv=none; b=Y+x4aeVa01nU9fWLxr15aCJxjgD9unco/8X2D9/Z9NeIG5IyybDPzJXzuw3QydfkyjGGcn xCc1npDBy77OGa9/AgW3oDdlrq1yvuPB0fAAjcWZZsY9fmRDD20pZuYtt29FK6UyScebuw CDW+BwFdb1SiDHGnyvmV0BrO6dgqNWy6AGvMuJg+LWf8t26B7y1zp5fbIQP4A68eVypTJe +2aurYXQyGyau/oDOcZgDmEBd8NdNXr/TDmwWrOymMDFHjSg2GeqY1Gd68m1lnk15thTWw ACimk0+FaCRlIhPfFLU+wG3U3IeQIQsAVNRJc5408r6089ngRhwRMpp65nC/UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dVRBb1mqczCYW for ; Mon, 15 Dec 2025 17:00:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d3cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 17:00:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: a39564b58f92 - stable/14 - gpart: Add u-boot-env alias for U-Boot's environment GPT partition UUID 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a39564b58f9253791446aa2709ae48b9bfdb7152 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 17:00:07 +0000 Message-Id: <69403e97.d3cc.bd72772@gitrepo.freebsd.org> The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=a39564b58f9253791446aa2709ae48b9bfdb7152 commit a39564b58f9253791446aa2709ae48b9bfdb7152 Author: Jessica Clarke AuthorDate: 2024-09-02 22:21:18 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 16:58:43 +0000 gpart: Add u-boot-env alias for U-Boot's environment GPT partition UUID This is a platform-independent UUID, and this is the name U-Boot uses. MFC after: 1 week (cherry picked from commit b162fc3f3094c50c8ed47ab50981c5448cf0052c) --- lib/geom/part/gpart.8 | 5 +++++ sys/geom/part/g_part.c | 1 + sys/geom/part/g_part.h | 1 + sys/geom/part/g_part_gpt.c | 2 ++ sys/sys/disk/gpt.h | 3 +++ 5 files changed, 12 insertions(+) diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8 index c424ba1157d9..176499c0d1e3 100644 --- a/lib/geom/part/gpart.8 +++ b/lib/geom/part/gpart.8 @@ -1008,6 +1008,11 @@ A illumos/Solaris partition dedicated to reserved space. The scheme-specific type is .Qq Li "!6a945a3b-1dd2-11b2-99a6-080020736631" for GPT. +.It Cm u-boot-env +A raw partition dedicated to U-Boot for storing its environment. +The scheme-specific type is +.Qq Li "!3de21764-95bd-54bd-a5c3-4abe786f38a8" +for GPT. .It Cm vmware-vmfs A partition that contains a VMware File System (VMFS). The scheme-specific types are diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c index 13752bbe8afe..10305ee940fe 100644 --- a/sys/geom/part/g_part.c +++ b/sys/geom/part/g_part.c @@ -131,6 +131,7 @@ struct g_part_alias_list { { "solaris-home", G_PART_ALIAS_SOLARIS_HOME }, { "solaris-altsec", G_PART_ALIAS_SOLARIS_ALTSEC }, { "solaris-reserved", G_PART_ALIAS_SOLARIS_RESERVED }, + { "u-boot-env", G_PART_ALIAS_U_BOOT_ENV }, { "vmware-reserved", G_PART_ALIAS_VMRESERVED }, { "vmware-vmfs", G_PART_ALIAS_VMFS }, { "vmware-vmkdiag", G_PART_ALIAS_VMKDIAG }, diff --git a/sys/geom/part/g_part.h b/sys/geom/part/g_part.h index ffeeca9022fe..13bbb1e4126a 100644 --- a/sys/geom/part/g_part.h +++ b/sys/geom/part/g_part.h @@ -103,6 +103,7 @@ enum g_part_alias { G_PART_ALIAS_SOLARIS_HOME, /* A Solaris /home partition entry. */ G_PART_ALIAS_SOLARIS_ALTSEC, /* A Solaris alternate sector partition entry. */ G_PART_ALIAS_SOLARIS_RESERVED, /* A Solaris reserved partition entry. */ + G_PART_ALIAS_U_BOOT_ENV, /* A U-Boot environment partition entry. */ G_PART_ALIAS_VMFS, /* A VMware VMFS partition entry */ G_PART_ALIAS_VMKDIAG, /* A VMware vmkDiagnostic partition entry */ G_PART_ALIAS_VMRESERVED, /* A VMware reserved partition entry */ diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c index c4cc840f583d..d795ccf4332b 100644 --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -224,6 +224,7 @@ static struct uuid gpt_uuid_solaris_var = GPT_ENT_TYPE_SOLARIS_VAR; static struct uuid gpt_uuid_solaris_home = GPT_ENT_TYPE_SOLARIS_HOME; static struct uuid gpt_uuid_solaris_altsec = GPT_ENT_TYPE_SOLARIS_ALTSEC; static struct uuid gpt_uuid_solaris_reserved = GPT_ENT_TYPE_SOLARIS_RESERVED; +static struct uuid gpt_uuid_u_boot_env = GPT_ENT_TYPE_U_BOOT_ENV; static struct uuid gpt_uuid_unused = GPT_ENT_TYPE_UNUSED; static struct uuid gpt_uuid_vmfs = GPT_ENT_TYPE_VMFS; static struct uuid gpt_uuid_vmkdiag = GPT_ENT_TYPE_VMKDIAG; @@ -296,6 +297,7 @@ static struct g_part_uuid_alias { { &gpt_uuid_solaris_home, G_PART_ALIAS_SOLARIS_HOME, 0 }, { &gpt_uuid_solaris_altsec, G_PART_ALIAS_SOLARIS_ALTSEC, 0 }, { &gpt_uuid_solaris_reserved, G_PART_ALIAS_SOLARIS_RESERVED, 0 }, + { &gpt_uuid_u_boot_env, G_PART_ALIAS_U_BOOT_ENV, 0 }, { &gpt_uuid_vmfs, G_PART_ALIAS_VMFS, 0 }, { &gpt_uuid_vmkdiag, G_PART_ALIAS_VMKDIAG, 0 }, { &gpt_uuid_vmreserved, G_PART_ALIAS_VMRESERVED, 0 }, diff --git a/sys/sys/disk/gpt.h b/sys/sys/disk/gpt.h index 596a5cba1681..426ae835c0c1 100644 --- a/sys/sys/disk/gpt.h +++ b/sys/sys/disk/gpt.h @@ -259,6 +259,9 @@ CTASSERT(sizeof(struct gpt_ent) == 128); #define GPT_ENT_TYPE_HIFIVE_BBL \ {0x2e54b353,0x1271,0x4842,0x80,0x6f,{0xe4,0x36,0xd6,0xaf,0x69,0x85}} +#define GPT_ENT_TYPE_U_BOOT_ENV \ + {0x3de21764,0x95bd,0x54bd,0xa5,0xc3,{0x4a,0xbe,0x78,0x6f,0x38,0xa8}} + /* * Boot partition used by GRUB 2. */