The branch main has been updated by kib:
URL:
https://cgit.FreeBSD.org/src/commit/?id=4cc167a35217f9cee81a2f366e451fae42fd4a6c
commit 4cc167a35217f9cee81a2f366e451fae42fd4a6c
Author: Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2021-10-11 22:02:35 +0000
Commit: Konstantin Belousov <k...@freebsd.org>
CommitDate: 2021-10-12 20:10:35 +0000
Restore PPS_SYNC in NOTES
This partially reverts e81e77c5a055, leaving the option both in
GENERICs on amd64/arm64/arm, and in global NOTES file. Apparently
this better matches existing practice, where we do not try to hard
to make LINT and GENERIC complimentary.
Requested and reviewed by: jhb
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/conf/NOTES | 6 ++++++
sys/powerpc/conf/NOTES | 2 --
sys/riscv/conf/NOTES | 2 --
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index e41b00edf2f6..39446fba06b3 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1245,6 +1245,12 @@ options CAPABILITY_MODE # sandboxes with no global
namespace access
options HZ=100
+# Enable support for the kernel PLL to use an external PPS signal,
+# under supervision of [x]ntpd(8)
+# More info in ntpd documentation: http://www.eecis.udel.edu/~ntp
+
+options PPS_SYNC
+
# Enable support for generic feed-forward clocks in the kernel.
# The feed-forward clock support is an alternative to the feedback oriented
# ntpd/system clock approach, and is to be used with a feed-forward
diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES
index 1a0c70fb08f9..78d990331ead 100644
--- a/sys/powerpc/conf/NOTES
+++ b/sys/powerpc/conf/NOTES
@@ -46,8 +46,6 @@ options PSIM #GDB PSIM ppc simulator
options MAMBO #IBM Mambo Full System Simulator
options QEMU #QEMU processor emulator
-options PPS_SYNC
-
# The cpufreq(4) driver provides support for CPU frequency control
device cpufreq
diff --git a/sys/riscv/conf/NOTES b/sys/riscv/conf/NOTES
index 60e842ab2709..7dda89bfe1a8 100644
--- a/sys/riscv/conf/NOTES
+++ b/sys/riscv/conf/NOTES
@@ -20,8 +20,6 @@ options FPE # Floating-point
extension support
options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default
options INTRNG # Include INTRNG framework
-options PPS_SYNC
-
# RISC-V SBI console
device rcons
