The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3a91cecea412cc6c73d10f7594a3b6f472748b9d
commit 3a91cecea412cc6c73d10f7594a3b6f472748b9d Author: Mitchell Horne <[email protected]> AuthorDate: 2022-06-14 17:19:46 +0000 Commit: Mitchell Horne <[email protected]> CommitDate: 2022-10-03 16:49:54 +0000 riscv: move GEOM_PART_GPT option to DEFAULTS This is consistent with other architectures. --- 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 d3d7229e0acc..ccc4eff8fcf0 100644 --- a/sys/riscv/conf/DEFAULTS +++ b/sys/riscv/conf/DEFAULTS @@ -11,6 +11,7 @@ device mem # Memory and kernel memory devices # Default partitioning schemes options GEOM_PART_BSD options GEOM_PART_MBR +options GEOM_PART_GPT # Default congestion control algorithm options CC_CUBIC # include CUBIC congestion control diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 7192a8aebe5f..1b7542c852ac 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
