diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2021-10-10 12:20:45 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2021-10-10 19:34:40 +0000 |
| commit | e81e77c5a055d1cbf6d6a6f0acbaf443267aa84f (patch) | |
| tree | 85a767099415025c4f5237fa997ea004b61d02b1 | |
| parent | 93e0523499fecb2ce1ca434c8ab96b58559771f3 (diff) | |
| download | src-e81e77c5a055d1cbf6d6a6f0acbaf443267aa84f.tar.gz src-e81e77c5a055d1cbf6d6a6f0acbaf443267aa84f.zip | |
Enable PPS_SYNC on amd64, arm64 and armv7
Remove the option from NOTES/LINT, and add to NOTES for powerpc and
riscv.
PR: 259036
Requested by: John Hay <john@sanren.ac.za>
Discussed with: ian, imp
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
| -rw-r--r-- | sys/amd64/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arm/conf/std.armv7 | 6 | ||||
| -rw-r--r-- | sys/arm64/conf/std.arm64 | 6 | ||||
| -rw-r--r-- | sys/conf/NOTES | 6 | ||||
| -rw-r--r-- | sys/powerpc/conf/NOTES | 2 | ||||
| -rw-r--r-- | sys/riscv/conf/NOTES | 2 |
6 files changed, 22 insertions, 6 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 40c14e90aef0..f47b995beb2c 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -138,6 +138,12 @@ options PCI_IOV # PCI SR-IOV support options COMPAT_LINUXKPI +# 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 + # Floppy drives device fdc diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7 index 2d1dfa135780..fda291df289a 100644 --- a/sys/arm/conf/std.armv7 +++ b/sys/arm/conf/std.armv7 @@ -84,3 +84,9 @@ options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default #options KTR_VERBOSE=0 #options USB_REQ_DEBUG #options USB_VERBOSE + +# 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 diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64 index 8460d449939d..5c26f19b4299 100644 --- a/sys/arm64/conf/std.arm64 +++ b/sys/arm64/conf/std.arm64 @@ -96,3 +96,9 @@ options NETDUMP # netdump(4) client support # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel + +# 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 diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 39446fba06b3..e41b00edf2f6 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1245,12 +1245,6 @@ 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 78d990331ead..1a0c70fb08f9 100644 --- a/sys/powerpc/conf/NOTES +++ b/sys/powerpc/conf/NOTES @@ -46,6 +46,8 @@ 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 7dda89bfe1a8..60e842ab2709 100644 --- a/sys/riscv/conf/NOTES +++ b/sys/riscv/conf/NOTES @@ -20,6 +20,8 @@ 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 |