The branch main has been updated by karels:
URL:
https://cgit.FreeBSD.org/src/commit/?id=8995b96f344d7d01f6ed87b189831b8fee52f45c
commit 8995b96f344d7d01f6ed87b189831b8fee52f45c
Author: Mike Karels <kar...@freebsd.org>
AuthorDate: 2023-02-23 17:44:18 +0000
Commit: Mike Karels <kar...@freebsd.org>
CommitDate: 2023-02-24 14:36:29 +0000
powerpc kernel config: clean up whitespace
Most options in kernel config files use "options<space><tab>OPTION".
This allows the option to be commented out without shifting columns.
A few options had two tabs, and some had spaces. Make them consistent.
---
sys/powerpc/conf/GENERIC | 2 +-
sys/powerpc/conf/GENERIC64 | 20 ++++++++++----------
sys/powerpc/conf/GENERIC64LE | 16 ++++++++--------
sys/powerpc/conf/MPC85XXSPE | 12 ++++++------
sys/powerpc/conf/NOTES | 4 ++--
5 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index b269893b01bd..52961b1d102e 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -32,7 +32,7 @@ options PSIM # GDB PSIM ppc simulator
options MAMBO # IBM Mambo Full System Simulator
options PSERIES # PAPR-compliant systems
-options FDT
+options FDT
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
options VIMAGE # Subsystem virtualization, e.g. VNET
diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
index 37a78446f07a..ab36e2032203 100644
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -30,11 +30,11 @@ makeoptions WITH_CTF=1
options POWERMAC # NewWorld Apple PowerMacs
options PS3 # Sony Playstation 3
options MAMBO # IBM Mambo Full System Simulator
-options QEMU # QEMU processor emulator
+options QEMU # QEMU processor emulator
options PSERIES # PAPR-compliant systems (e.g. IBM p)
options POWERNV # Non-virtualized OpenPOWER systems
-options FDT # Flattened Device Tree
+options FDT # Flattened Device Tree
options SCHED_ULE # ULE scheduler
options NUMA # Non-Uniform Memory Architecture
support
options PREEMPTION # Enable kernel thread preemption
@@ -42,8 +42,8 @@ options VIMAGE # Subsystem
virtualization, e.g. VNET
options INET # InterNETworking
options INET6 # IPv6 communications protocols
options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5
-options NETLINK # netlink(4) support
-options ROUTE_MPATH # Multipath routing support
+options NETLINK # netlink(4) support
+options ROUTE_MPATH # Multipath routing support
options TCP_OFFLOAD # TCP offload
options TCP_BLACKBOX # Enhanced TCP event logging
options TCP_HHOOK # hhook(9) framework for TCP
@@ -84,7 +84,7 @@ options SYSVSHM # SYSV-style shared
memory
options SYSVMSG # SYSV-style message queues
options SYSVSEM # SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time
extensions
-options PRINTF_BUFR_SIZE=128 # Prevent printf output being
interspersed.
+options PRINTF_BUFR_SIZE=128 # Prevent printf output being
interspersed.
options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
options CAPABILITY_MODE # Capsicum capability mode
@@ -136,7 +136,7 @@ device siis # SiliconImage
SiI3124/SiI3132/SiI3531 SATA
# NVM Express (NVMe) support
device nvme # base NVMe driver
-options NVME_USE_NVD=0 # prefer the cam(4) based nda(4) driver
+options NVME_USE_NVD=0 # prefer the cam(4) based nda(4) driver
device nvd # expose NVMe namespaces as disks, depends on
nvme
# SCSI Controllers
@@ -226,8 +226,8 @@ device kue # Kawasaki LSI USB
Ethernet
# Wireless NIC cards
device wlan # 802.11 support
-options IEEE80211_SUPPORT_MESH # enable 802.11s draft support
-options IEEE80211_DEBUG # enable debug msgs
+options IEEE80211_SUPPORT_MESH # enable 802.11s draft support
+options IEEE80211_DEBUG # enable debug msgs
device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
@@ -235,8 +235,8 @@ device wlan_amrr # AMRR transmit rate
control algorithm
device ath # Atheros NICs
device ath_pci # Atheros pci/cardbus glue
device ath_hal # pci/cardbus chip support
-options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt
mitigation
-options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and
later
+options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation
+options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later
device ath_rate_sample # SampleRate tx rate control for ath
# FireWire support
diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE
index 5e6d26c4a775..ffb43628d2b1 100644
--- a/sys/powerpc/conf/GENERIC64LE
+++ b/sys/powerpc/conf/GENERIC64LE
@@ -28,12 +28,12 @@ makeoptions WITH_CTF=1
# Platform support
options MAMBO # IBM Mambo Full System Simulator
-options QEMU # QEMU processor emulator
+options QEMU # QEMU processor emulator
options PSERIES # PAPR-compliant systems (e.g. IBM p)
options POWERNV # Non-virtualized OpenPOWER systems
options ISA_206_ATOMICS # PowerISA v2.06 optimized subword
atomics
-options FDT # Flattened Device Tree
+options FDT # Flattened Device Tree
options SCHED_ULE # ULE scheduler
options NUMA # Non-Uniform Memory Architecture
support
options PREEMPTION # Enable kernel thread preemption
@@ -79,7 +79,7 @@ options SYSVSHM # SYSV-style shared
memory
options SYSVMSG # SYSV-style message queues
options SYSVSEM # SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time
extensions
-options PRINTF_BUFR_SIZE=128 # Prevent printf output being
interspersed.
+options PRINTF_BUFR_SIZE=128 # Prevent printf output being
interspersed.
options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
options CAPABILITY_MODE # Capsicum capability mode
@@ -131,7 +131,7 @@ device siis # SiliconImage
SiI3124/SiI3132/SiI3531 SATA
# NVM Express (NVMe) support
device nvme # base NVMe driver
-options NVME_USE_NVD=0 # prefer the cam(4) based nda(4) driver
+options NVME_USE_NVD=0 # prefer the cam(4) based nda(4) driver
device nvd # expose NVMe namespaces as disks, depends on
nvme
# SCSI Controllers
@@ -221,8 +221,8 @@ device kue # Kawasaki LSI USB
Ethernet
# Wireless NIC cards
device wlan # 802.11 support
-options IEEE80211_SUPPORT_MESH # enable 802.11s draft support
-options IEEE80211_DEBUG # enable debug msgs
+options IEEE80211_SUPPORT_MESH # enable 802.11s draft support
+options IEEE80211_DEBUG # enable debug msgs
device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
@@ -230,8 +230,8 @@ device wlan_amrr # AMRR transmit rate
control algorithm
device ath # Atheros NICs
device ath_pci # Atheros pci/cardbus glue
device ath_hal # pci/cardbus chip support
-options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt
mitigation
-options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and
later
+options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation
+options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later
device ath_rate_sample # SampleRate tx rate control for ath
# FireWire support
diff --git a/sys/powerpc/conf/MPC85XXSPE b/sys/powerpc/conf/MPC85XXSPE
index 45c8d09f5cfb..1d7ef9ac9742 100644
--- a/sys/powerpc/conf/MPC85XXSPE
+++ b/sys/powerpc/conf/MPC85XXSPE
@@ -34,7 +34,7 @@ options FDT
options FFS
options GDB
options GEOM_PART_GPT
-options GEOM_LABEL # Provides labelization
+options GEOM_LABEL # Provides labelization
options INET
options INET6
options TCP_HHOOK # hhook(9) framework for TCP
@@ -63,11 +63,11 @@ options WITNESS_SKIPSPIN
# The powerpcspe target arch can run non Altivec/VMX powerpc binaries
# Keep COMPAT options in sync with powerpc target arch.
-options COMPAT_FREEBSD6 # Compatible with FreeBSD6
-options COMPAT_FREEBSD7 # Compatible with FreeBSD7
-options COMPAT_FREEBSD9 # Compatible with FreeBSD9
-options COMPAT_FREEBSD10 # Compatible with FreeBSD10
-options COMPAT_FREEBSD11 # Compatible with FreeBSD11
+options COMPAT_FREEBSD6 # Compatible with FreeBSD6
+options COMPAT_FREEBSD7 # Compatible with FreeBSD7
+options COMPAT_FREEBSD9 # Compatible with FreeBSD9
+options COMPAT_FREEBSD10 # Compatible with FreeBSD10
+options COMPAT_FREEBSD11 # Compatible with FreeBSD11
options COMPAT_FREEBSD12 # Compatible with FreeBSD12
options COMPAT_FREEBSD13 # Compatible with FreeBSD13
diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES
index 78d990331ead..b7c7921f6a68 100644
--- a/sys/powerpc/conf/NOTES
+++ b/sys/powerpc/conf/NOTES
@@ -41,10 +41,10 @@ options FPU_EMU
#options MPC85XX
options POWERMAC #NewWorld Apple PowerMacs
-#options PS3 #Sony Playstation 3
+#options PS3 #Sony Playstation 3
options PSIM #GDB PSIM ppc simulator
options MAMBO #IBM Mambo Full System Simulator
-options QEMU #QEMU processor emulator
+options QEMU #QEMU processor emulator
# The cpufreq(4) driver provides support for CPU frequency control
device cpufreq
