git: c683063a00d0 - stable/13 - Enable PPS_SYNC on amd64, arm64 and armv7

The branch stable/13 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=c683063a00d0ff37afd16f7baf6d0a5e84e3a18f

commit c683063a00d0ff37afd16f7baf6d0a5e84e3a18f
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2021-10-10 12:20:45 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2021-10-17 00:28:13 +0000

    Enable PPS_SYNC on amd64, arm64 and armv7
    
    PR:     259036
    
    (cherry picked from commit e81e77c5a055d1cbf6d6a6f0acbaf443267aa84f)
---
 sys/amd64/conf/GENERIC | 6 ++++++
 sys/arm/conf/std.armv7 | 6 ++++++
 sys/arm64/conf/GENERIC | 2 ++
 sys/conf/NOTES         | 6 ------
 sys/powerpc/conf/NOTES | 2 ++
 sys/riscv/conf/NOTES   | 2 ++
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 82d143c18f51..3478c9a3db26 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -123,6 +123,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 b15f9f9a70fa..dbe863d9da92 100644
--- a/sys/arm/conf/std.armv7
+++ b/sys/arm/conf/std.armv7
@@ -71,3 +71,9 @@ options 	KDB_TRACE		# Print a stack trace for a panic.
 #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/GENERIC b/sys/arm64/conf/GENERIC
index eea4441f096f..a37d78332276 100644
--- a/sys/arm64/conf/GENERIC
+++ b/sys/arm64/conf/GENERIC
@@ -121,6 +121,8 @@ options 	SOC_ROCKCHIP_RK3328
 options 	SOC_ROCKCHIP_RK3399
 options 	SOC_XILINX_ZYNQ
 
+options 	PPS_SYNC
+
 # Timer drivers
 device		a10_timer
 
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index f73b5a466366..5f97933a512a 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1250,12 +1250,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