The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a1c3ab7c09ae23110f550b960cdbcc26bac5b0cb
commit a1c3ab7c09ae23110f550b960cdbcc26bac5b0cb Author: Mitchell Horne <[email protected]> AuthorDate: 2022-06-14 17:19:46 +0000 Commit: Mitchell Horne <[email protected]> CommitDate: 2022-10-09 17:02:31 +0000 riscv: move GEOM_PART_GPT option to DEFAULTS This is consistent with other architectures. (cherry picked from commit 3a91cecea412cc6c73d10f7594a3b6f472748b9d) --- sys/riscv/conf/DEFAULTS | 1 + sys/riscv/conf/GENERIC | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/riscv/conf/DEFAULTS b/sys/riscv/conf/DEFAULTS index 94c6bf283c45..082e52247b3d 100644 --- a/sys/riscv/conf/DEFAULTS +++ b/sys/riscv/conf/DEFAULTS @@ -11,5 +11,6 @@ device mem # Memory and kernel memory devices # Default partitioning schemes options GEOM_PART_BSD options GEOM_PART_MBR +options GEOM_PART_GPT options NEW_PCIB diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 12d48986184a..6cce48b884c0 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -49,7 +49,6 @@ options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework options TMPFS # Efficient memory filesystem -options GEOM_PART_GPT # GUID Partition Tables. options GEOM_RAID # Soft RAID functionality. options GEOM_LABEL # Provides labelization options COMPAT_FREEBSD12 # Compatible with FreeBSD12
