From nobody Wed Jan 26 15:55:07 2022 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 D3681196FC34; Wed, 26 Jan 2022 15:55:07 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JkSwW4ZpJz3Gh7; Wed, 26 Jan 2022 15:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643212507; 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=zO5Smkwpqs0rlUf9H7v7XSEKACSaITGf/VyWpvmwSks=; b=IjWflfYo/WWCPRhOxInm4AKsQZheFe3pKC2LFruX3bv1mcIDwcaR4xp+zg+wG2mtLn3+We Ymw4lRvW8pXD8aZ/aTqB2g/PfW5gGyEOvlyOOQbYqN81PqohjU7+AmS7cXn/ElU0s9zmXn E2xYu+q5PVAdeo/8vRWj2CCjCp5JIsqSYrslNX72LNtLqniCmHpNMku/R/lBVlfaXjhWo+ K70fjnUGaiiB6Puv5WMZ49SGOG/yt7LNP98h1NRRBaTxS6YMHF7PBImcnJL6kfHlJBMk/G hZiyTuYpf/b5QDrJ9S2R4Anum+LX3T6wUj5y674h1W0ayV0V8GhvK7/cvtzQBQ== 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 7B77220233; Wed, 26 Jan 2022 15:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20QFt7gY030170; Wed, 26 Jan 2022 15:55:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20QFt7hu030169; Wed, 26 Jan 2022 15:55:07 GMT (envelope-from git) Date: Wed, 26 Jan 2022 15:55:07 GMT Message-Id: <202201261555.20QFt7hu030169@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 9c296a210573 - main - geom: Add HiFive boot partitions 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c296a2105734c6928b4e4a9d75d6a17ff9b9bab Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643212507; 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=zO5Smkwpqs0rlUf9H7v7XSEKACSaITGf/VyWpvmwSks=; b=Dx54NZmW/RBLrF6fRbamv4klI/ITHecu8xpiz4AxP90MqrYzV1aD8/JOl7/Xm/zTIIRGBM 6A9MY9MaBih2hEAVChxudyg5V02RvyM3RqU/cVN7LSvEVHCYMW6FWt1EBTkWBtwqO0q2S6 VYsUuDio+Fb4NweEHCMMqBqAoewoWMD4v2mZF5VBVj2ft1RgNisihfVJ/f7KYEVa7E6LY0 F8BBkKCz50g+whk6qOQD/g0fPMu1YRDlU2dcebegGGf1bjDWD5kI+YJaEWKss69rTlZUOl IVKhXyA6G+mOmioERTRibkOF2JaZLr6m0m4k/+l8g8GMCGQcpFcVchldxqi8+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643212507; a=rsa-sha256; cv=none; b=WQWcQ9d5qj3Eorzck8SO0GFYfuudoVv56gHat0rr5q+qJZzLmTy2Wlr0/4oVH8PtSeWGsY pcxR5r1aG1sFk1WB9moKGsZ4HZd2DriOFkvHM5JStX2q73mEhUDWiGrBn77pcYjs2Y3NKJ OKR5ELQbWvvmX4FMfrnqq/l8x8kyd/hsCTKpuXpEQU5xkg4Q/MPr2vl8Sw8pVzdcCBPe+B dVPrnXgH1/axvTVsHxM+wOyDPAGW6LCiIlQNZxEMOJ7ZdloLCsr7e8A7Y9ZPuctk6ItqeQ 1RFEFK4D8aenyAdcBwr/nB7cn78go23MrtmV5dLyw85UK/3mOmRPH9bHk83RDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9c296a2105734c6928b4e4a9d75d6a17ff9b9bab commit 9c296a2105734c6928b4e4a9d75d6a17ff9b9bab Author: Ed Maste AuthorDate: 2021-10-12 18:51:24 +0000 Commit: Ed Maste CommitDate: 2022-01-26 15:54:45 +0000 geom: Add HiFive boot partitions As documented in the HiFive Unmatched Software Reference Manual. Reviewed by: imp, mhorne Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34010 --- lib/geom/part/gpart.8 | 12 +++++++++++- sys/geom/part/g_part.c | 2 ++ sys/geom/part/g_part.h | 2 ++ sys/geom/part/g_part_gpt.c | 4 ++++ sys/sys/disk/gpt.h | 5 +++++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8 index 15335d92221c..4dbe45b9953e 100644 --- a/lib/geom/part/gpart.8 +++ b/lib/geom/part/gpart.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 17, 2020 +.Dd January 26, 2022 .Dt GPART 8 .Os .Sh NAME @@ -837,6 +837,16 @@ A partition that contains a FAT32 (LBA) filesystem. The scheme-specific type is .Qq Li "!12" for MBR. +.It Cm hifive-fsbl +A raw partition containing a HiFive first stage bootloader. +The scheme-specific type is +.Qq Li "!5b193300-fc78-40cd-8002-e86c45580b47" +for GPT. +.It Cm hifive-bbl +A raw partition containing a HiFive second stage bootloader. +The scheme-specific type is +.Qq Li "!2e54b353-1271-4842-806f-e436d6af6985" +for GPT. .It Cm linux-data A Linux partition that contains some filesystem with data. The scheme-specific types are diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c index 57d45911c54d..a0981d89b042 100644 --- a/sys/geom/part/g_part.c +++ b/sys/geom/part/g_part.c @@ -103,6 +103,8 @@ struct g_part_alias_list { { "freebsd-ufs", G_PART_ALIAS_FREEBSD_UFS }, { "freebsd-vinum", G_PART_ALIAS_FREEBSD_VINUM }, { "freebsd-zfs", G_PART_ALIAS_FREEBSD_ZFS }, + { "hifive-fsbl", G_PART_ALIAS_HIFIVE_FSBL }, + { "hifive-bbl", G_PART_ALIAS_HIFIVE_BBL }, { "linux-data", G_PART_ALIAS_LINUX_DATA }, { "linux-lvm", G_PART_ALIAS_LINUX_LVM }, { "linux-raid", G_PART_ALIAS_LINUX_RAID }, diff --git a/sys/geom/part/g_part.h b/sys/geom/part/g_part.h index e9ac3052430c..c96cec264b87 100644 --- a/sys/geom/part/g_part.h +++ b/sys/geom/part/g_part.h @@ -72,6 +72,8 @@ enum g_part_alias { G_PART_ALIAS_FREEBSD_UFS, /* A UFS/UFS2 file system entry. */ G_PART_ALIAS_FREEBSD_VINUM, /* A Vinum partition entry. */ G_PART_ALIAS_FREEBSD_ZFS, /* A ZFS file system entry. */ + G_PART_ALIAS_HIFIVE_FSBL, /* HiFive First Stage Bootloader */ + G_PART_ALIAS_HIFIVE_BBL, /* HiFive Second Stage Bootloader */ G_PART_ALIAS_LINUX_DATA, /* A Linux data partition entry. */ G_PART_ALIAS_LINUX_LVM, /* A Linux LVM partition entry. */ G_PART_ALIAS_LINUX_RAID, /* A Linux RAID partition entry. */ diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c index 1f6d3dff249d..0c472e5ebba6 100644 --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -193,6 +193,8 @@ static struct uuid gpt_uuid_freebsd_swap = GPT_ENT_TYPE_FREEBSD_SWAP; static struct uuid gpt_uuid_freebsd_ufs = GPT_ENT_TYPE_FREEBSD_UFS; static struct uuid gpt_uuid_freebsd_vinum = GPT_ENT_TYPE_FREEBSD_VINUM; static struct uuid gpt_uuid_freebsd_zfs = GPT_ENT_TYPE_FREEBSD_ZFS; +static struct uuid gpt_uuid_hifive_fsbl = GPT_ENT_TYPE_HIFIVE_FSBL; +static struct uuid gpt_uuid_hifive_bbl = GPT_ENT_TYPE_HIFIVE_BBL; static struct uuid gpt_uuid_linux_data = GPT_ENT_TYPE_LINUX_DATA; static struct uuid gpt_uuid_linux_lvm = GPT_ENT_TYPE_LINUX_LVM; static struct uuid gpt_uuid_linux_raid = GPT_ENT_TYPE_LINUX_RAID; @@ -263,6 +265,8 @@ static struct g_part_uuid_alias { { &gpt_uuid_freebsd_ufs, G_PART_ALIAS_FREEBSD_UFS, 0 }, { &gpt_uuid_freebsd_vinum, G_PART_ALIAS_FREEBSD_VINUM, 0 }, { &gpt_uuid_freebsd_zfs, G_PART_ALIAS_FREEBSD_ZFS, 0 }, + { &gpt_uuid_hifive_fsbl, G_PART_ALIAS_HIFIVE_FSBL, 0 }, + { &gpt_uuid_hifive_bbl, G_PART_ALIAS_HIFIVE_BBL, 0 }, { &gpt_uuid_linux_data, G_PART_ALIAS_LINUX_DATA, 0x0b }, { &gpt_uuid_linux_lvm, G_PART_ALIAS_LINUX_LVM, 0 }, { &gpt_uuid_linux_raid, G_PART_ALIAS_LINUX_RAID, 0 }, diff --git a/sys/sys/disk/gpt.h b/sys/sys/disk/gpt.h index 3cb8d8e071e8..e4faef2c37fb 100644 --- a/sys/sys/disk/gpt.h +++ b/sys/sys/disk/gpt.h @@ -249,6 +249,11 @@ CTASSERT(sizeof(struct gpt_ent) == 128); #define GPT_ENT_TYPE_SOLARIS_RESERVED \ {0x6a945a3b,0x1dd2,0x11b2,0x99,0xa6,{0x08,0x00,0x20,0x73,0x66,0x31}} +#define GPT_ENT_TYPE_HIFIVE_FSBL \ + {0x5b193300,0xfc78,0x40cd,0x80,0x02,{0xe8,0x6c,0x45,0x58,0x0b,0x47}} +#define GPT_ENT_TYPE_HIFIVE_BBL \ + {0x2e54b353,0x1271,0x4842,0x80,0x6f,{0xe4,0x36,0xd6,0xaf,0x69,0x85}} + /* * Boot partition used by GRUB 2. */