The branch main has been updated by alfredo:

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

commit 8d1ab5ad8449e6f51f081e261ed6202a0483a595
Author:     Alfredo Dal'Ava Junior <[email protected]>
AuthorDate: 2021-12-14 23:42:00 +0000
Commit:     Alfredo Dal'Ava Junior <[email protected]>
CommitDate: 2021-12-15 00:01:25 +0000

    powerpc: kernel config style
    
    Sponsored by:   Instituto de Pesquisas Eldorado (eldorado.org.br)
    Reviewed by:    imp
---
 sys/powerpc/conf/GENERIC     |  92 +++++++++++++++++++-------------------
 sys/powerpc/conf/GENERIC64   | 104 +++++++++++++++++++++----------------------
 sys/powerpc/conf/GENERIC64LE |  96 +++++++++++++++++++--------------------
 sys/powerpc/conf/MPC85XXSPE  |   2 +-
 4 files changed, 147 insertions(+), 147 deletions(-)

diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 4897cfb6ae6c..77c88cf05f78 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -23,60 +23,60 @@ ident               GENERIC
 
 machine        powerpc powerpc
 
-makeoptions    DEBUG=-g                #Build kernel with gdb(1) debug symbols
+makeoptions    DEBUG=-g                # Build kernel with gdb(1) debug symbols
 makeoptions    WITH_CTF=1
 
 # Platform support
-options        POWERMAC                #NewWorld Apple PowerMacs
-options        PSIM                    #GDB PSIM ppc simulator
-options        MAMBO                   #IBM Mambo Full System Simulator
-options        PSERIES                 #PAPR-compliant systems
+options        POWERMAC                # NewWorld Apple PowerMacs
+options        PSIM                    # GDB PSIM ppc simulator
+options        MAMBO                   # IBM Mambo Full System Simulator
+options        PSERIES                 # PAPR-compliant systems
 
 options                FDT
-options        SCHED_ULE               #ULE scheduler
-options        PREEMPTION              #Enable kernel thread preemption
+options        SCHED_ULE               # ULE scheduler
+options        PREEMPTION              # Enable kernel thread preemption
 options        VIMAGE                  # Subsystem virtualization, e.g. VNET
-options        INET                    #InterNETworking
-options        INET6                   #IPv6 communications protocols
+options        INET                    # InterNETworking
+options        INET6                   # IPv6 communications protocols
 options        IPSEC_SUPPORT           # Allow kldload of ipsec and tcpmd5
 options        TCP_HHOOK               # hhook(9) framework for TCP
 options        TCP_RFC7413             # TCP Fast Open
 options        SCTP_SUPPORT            # Allow kldload of SCTP
-options        FFS                     #Berkeley Fast Filesystem
-options        SOFTUPDATES             #Enable FFS soft updates support
-options        UFS_ACL                 #Support for access control lists
-options        UFS_DIRHASH             #Improve performance on big directories
-options        UFS_GJOURNAL            #Enable gjournal-based UFS journaling
-options        QUOTA                   #Enable disk quotas for UFS
-options        MD_ROOT                 #MD is a potential root device
-options        NFSCL                   #Network Filesystem Client
-options        NFSD                    #Network Filesystem Server
-options        NFSLOCKD                #Network Lock Manager
-options        NFS_ROOT                #NFS usable as root device
-options        MSDOSFS                 #MSDOS Filesystem
-options        CD9660                  #ISO 9660 Filesystem
-options        PROCFS                  #Process filesystem (requires PSEUDOFS)
-options        PSEUDOFS                #Pseudo-filesystem framework
-options        TMPFS                   #Efficient memory filesystem
-options        GEOM_PART_APM           #Apple Partition Maps.
-options        GEOM_PART_GPT           #GUID Partition Tables.
-options        GEOM_LABEL              #Provides labelization
-options        COMPAT_FREEBSD4         #Keep this for a while
-options        COMPAT_FREEBSD5         #Compatible with FreeBSD5
-options        COMPAT_FREEBSD6         #Compatible with FreeBSD6
-options        COMPAT_FREEBSD7         #Compatible with FreeBSD7
+options        FFS                     # Berkeley Fast Filesystem
+options        SOFTUPDATES             # Enable FFS soft updates support
+options        UFS_ACL                 # Support for access control lists
+options        UFS_DIRHASH             # Improve performance on big directories
+options        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
+options        QUOTA                   # Enable disk quotas for UFS
+options        MD_ROOT                 # MD is a potential root device
+options        NFSCL                   # Network Filesystem Client
+options        NFSD                    # Network Filesystem Server
+options        NFSLOCKD                # Network Lock Manager
+options        NFS_ROOT                # NFS usable as root device
+options        MSDOSFS                 # MSDOS Filesystem
+options        CD9660                  # ISO 9660 Filesystem
+options        PROCFS                  # Process filesystem (requires PSEUDOFS)
+options        PSEUDOFS                # Pseudo-filesystem framework
+options        TMPFS                   # Efficient memory filesystem
+options        GEOM_PART_APM           # Apple Partition Maps.
+options        GEOM_PART_GPT           # GUID Partition Tables.
+options        GEOM_LABEL              # Provides labelization
+options        COMPAT_FREEBSD4         # Keep this for a while
+options        COMPAT_FREEBSD5         # Compatible with FreeBSD5
+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
-options        SCSI_DELAY=5000         #Delay (in ms) before probing SCSI 
-options        KTRACE                  #ktrace(1) syscall trace support
-options        STACK                   #stack(9) support
-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        SCSI_DELAY=5000         # Delay (in ms) before probing SCSI 
+options        KTRACE                  # ktrace(1) syscall trace support
+options        STACK                   # stack(9) support
+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        HWPMC_HOOKS             # Necessary kernel hooks for hwpmc(4)
 options        AUDIT                   # Security event auditing
 options        CAPABILITY_MODE         # Capsicum capability mode
@@ -93,12 +93,12 @@ options     RCTL                    # Resource limits
 options        KDB                     # Enable kernel debugger support.
 options        KDB_TRACE               # Print a stack trace for a panic.
 # For full debugger support use (turn off in stable branch):
-options        DDB                     #Support DDB
-#options       DEADLKRES               #Enable the deadlock resolver
-options        INVARIANTS              #Enable calls of extra sanity checking
-options        INVARIANT_SUPPORT       #Extra sanity checks of internal 
structures, required by INVARIANTS
-options        WITNESS                 #Enable checks to detect deadlocks and 
cycles
-options        WITNESS_SKIPSPIN        #Don't run witness on spinlocks for 
speed
+options        DDB                     # Support DDB
+#options       DEADLKRES               # Enable the deadlock resolver
+options        INVARIANTS              # Enable calls of extra sanity checking
+options        INVARIANT_SUPPORT       # Extra sanity checks of internal 
structures, required by INVARIANTS
+options        WITNESS                 # Enable checks to detect deadlocks and 
cycles
+options        WITNESS_SKIPSPIN        # Don't run witness on spinlocks for 
speed
 options        MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
 options        VERBOSE_SYSINIT=0       # Support debug.verbose_sysinit, off by 
default
 
@@ -176,7 +176,7 @@ device              firmware        # firmware assist module
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
 # Note that 'bpf' is required for DHCP.
-device         bpf             #Berkeley packet filter
+device         bpf             # Berkeley packet filter
 
 # USB support
 options        USB_DEBUG       # enable debug msgs
diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
index c6c8fc2eb00c..17fa9684d27c 100644
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -1,5 +1,5 @@
 #
-# GENERIC -- Generic kernel configuration file for FreeBSD/powerpc
+# GENERIC64 -- Generic kernel configuration file for FreeBSD/powerpc64
 #
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
@@ -23,24 +23,24 @@ ident               GENERIC
 
 machine        powerpc powerpc64
 
-makeoptions    DEBUG=-g                #Build kernel with gdb(1) debug symbols
+makeoptions    DEBUG=-g                # Build kernel with gdb(1) debug symbols
 makeoptions    WITH_CTF=1
 
 # Platform support
-options        POWERMAC                #NewWorld Apple PowerMacs
-options        PS3                     #Sony Playstation 3
-options        MAMBO                   #IBM Mambo Full System Simulator
-options                QEMU                    #QEMU processor emulator
-options        PSERIES                 #PAPR-compliant systems (e.g. IBM p)
-options        POWERNV                 #Non-virtualized OpenPOWER systems
+options        POWERMAC                # NewWorld Apple PowerMacs
+options        PS3                     # Sony Playstation 3
+options        MAMBO                   # IBM Mambo Full System Simulator
+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        SCHED_ULE               #ULE scheduler
-options        NUMA                    #Non-Uniform Memory Architecture support
-options        PREEMPTION              #Enable kernel thread preemption
+options                FDT                     # Flattened Device Tree
+options        SCHED_ULE               # ULE scheduler
+options        NUMA                    # Non-Uniform Memory Architecture 
support
+options        PREEMPTION              # Enable kernel thread preemption
 options        VIMAGE                  # Subsystem virtualization, e.g. VNET
-options        INET                    #InterNETworking
-options        INET6                   #IPv6 communications protocols
+options        INET                    # InterNETworking
+options        INET6                   # IPv6 communications protocols
 options        IPSEC_SUPPORT           # Allow kldload of ipsec and tcpmd5
 options                ROUTE_MPATH             # Multipath routing support
 options        TCP_OFFLOAD             # TCP offload
@@ -48,42 +48,42 @@ options     TCP_BLACKBOX            # Enhanced TCP event 
logging
 options        TCP_HHOOK               # hhook(9) framework for TCP
 options        TCP_RFC7413             # TCP Fast Open
 options        SCTP_SUPPORT            # Allow kldload of SCTP
-options        FFS                     #Berkeley Fast Filesystem
-options        SOFTUPDATES             #Enable FFS soft updates support
-options        UFS_ACL                 #Support for access control lists
-options        UFS_DIRHASH             #Improve performance on big directories
-options        UFS_GJOURNAL            #Enable gjournal-based UFS journaling
-options        QUOTA                   #Enable disk quotas for UFS
-options        MD_ROOT                 #MD is a potential root device
-options        MD_ROOT_MEM             #Enable use of initrd as MD root
-options        NFSCL                   #Network Filesystem Client
-options        NFSD                    #Network Filesystem Server
-options        NFSLOCKD                #Network Lock Manager
-options        NFS_ROOT                #NFS usable as root device
-options        MSDOSFS                 #MSDOS Filesystem
-options        CD9660                  #ISO 9660 Filesystem
-options        PROCFS                  #Process filesystem (requires PSEUDOFS)
-options        PSEUDOFS                #Pseudo-filesystem framework
-options        TMPFS                   #Efficient memory filesystem
-options        GEOM_PART_APM           #Apple Partition Maps.
-options        GEOM_PART_GPT           #GUID Partition Tables.
-options        GEOM_LABEL              #Provides labelization
-options        COMPAT_FREEBSD32        #Compatible with FreeBSD/powerpc 
binaries
-options        COMPAT_FREEBSD5         #Compatible with FreeBSD5
-options        COMPAT_FREEBSD6         #Compatible with FreeBSD6
-options        COMPAT_FREEBSD7         #Compatible with FreeBSD7
+options        FFS                     # Berkeley Fast Filesystem
+options        SOFTUPDATES             # Enable FFS soft updates support
+options        UFS_ACL                 # Support for access control lists
+options        UFS_DIRHASH             # Improve performance on big directories
+options        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
+options        QUOTA                   # Enable disk quotas for UFS
+options        MD_ROOT                 # MD is a potential root device
+options        MD_ROOT_MEM             # Enable use of initrd as MD root
+options        NFSCL                   # Network Filesystem Client
+options        NFSD                    # Network Filesystem Server
+options        NFSLOCKD                # Network Lock Manager
+options        NFS_ROOT                # NFS usable as root device
+options        MSDOSFS                 # MSDOS Filesystem
+options        CD9660                  # ISO 9660 Filesystem
+options        PROCFS                  # Process filesystem (requires PSEUDOFS)
+options        PSEUDOFS                # Pseudo-filesystem framework
+options        TMPFS                   # Efficient memory filesystem
+options        GEOM_PART_APM           # Apple Partition Maps.
+options        GEOM_PART_GPT           # GUID Partition Tables.
+options        GEOM_LABEL              # Provides labelization
+options        COMPAT_FREEBSD32        # Compatible with FreeBSD/powerpc 
binaries
+options        COMPAT_FREEBSD5         # Compatible with FreeBSD5
+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
-options        SCSI_DELAY=5000         #Delay (in ms) before probing SCSI 
-options        KTRACE                  #ktrace(1) syscall trace support
-options        STACK                   #stack(9) support
-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        SCSI_DELAY=5000         # Delay (in ms) before probing SCSI 
+options        KTRACE                  # ktrace(1) syscall trace support
+options        STACK                   # stack(9) support
+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        HWPMC_HOOKS             # Necessary kernel hooks for hwpmc(4)
 options        AUDIT                   # Security event auditing
@@ -101,12 +101,12 @@ options   RCTL                    # Resource limits
 options        KDB                     # Enable kernel debugger support.
 options        KDB_TRACE               # Print a stack trace for a panic.
 # For full debugger support use (turn off in stable branch):
-options        DDB                     #Support DDB
-#options       DEADLKRES               #Enable the deadlock resolver
-options        INVARIANTS              #Enable calls of extra sanity checking
-options        INVARIANT_SUPPORT       #Extra sanity checks of internal 
structures, required by INVARIANTS
-options        WITNESS                 #Enable checks to detect deadlocks and 
cycles
-options        WITNESS_SKIPSPIN        #Don't run witness on spinlocks for 
speed
+options        DDB                     # Support DDB
+#options       DEADLKRES               # Enable the deadlock resolver
+options        INVARIANTS              # Enable calls of extra sanity checking
+options        INVARIANT_SUPPORT       # Extra sanity checks of internal 
structures, required by INVARIANTS
+options        WITNESS                 # Enable checks to detect deadlocks and 
cycles
+options        WITNESS_SKIPSPIN        # Don't run witness on spinlocks for 
speed
 options        MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
 options        VERBOSE_SYSINIT=0       # Support debug.verbose_sysinit, off by 
default
 
@@ -203,7 +203,7 @@ device              firmware        # firmware assist module
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
 # Note that 'bpf' is required for DHCP.
-device         bpf             #Berkeley packet filter
+device         bpf             # Berkeley packet filter
 
 # USB support
 options        USB_DEBUG       # enable debug msgs
diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE
index 699ac9f16060..a84e8f622f49 100644
--- a/sys/powerpc/conf/GENERIC64LE
+++ b/sys/powerpc/conf/GENERIC64LE
@@ -1,5 +1,5 @@
 #
-# GENERIC -- Generic kernel configuration file for FreeBSD/powerpc
+# GENERIC64LE -- Generic kernel configuration file for FreeBSD/powerpc64le
 #
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
@@ -23,59 +23,59 @@ ident               GENERIC
 
 machine        powerpc powerpc64le
 
-makeoptions    DEBUG=-g                #Build kernel with gdb(1) debug symbols
+makeoptions    DEBUG=-g                # Build kernel with gdb(1) debug symbols
 makeoptions    WITH_CTF=1
 
 # Platform support
-options        MAMBO                   #IBM Mambo Full System Simulator
-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        SCHED_ULE               #ULE scheduler
-options        NUMA                    #Non-Uniform Memory Architecture support
-options        PREEMPTION              #Enable kernel thread preemption
+options        MAMBO                   # IBM Mambo Full System Simulator
+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        SCHED_ULE               # ULE scheduler
+options        NUMA                    # Non-Uniform Memory Architecture 
support
+options        PREEMPTION              # Enable kernel thread preemption
 options        VIMAGE                  # Subsystem virtualization, e.g. VNET
-options        INET                    #InterNETworking
-options        INET6                   #IPv6 communications protocols
+options        INET                    # InterNETworking
+options        INET6                   # IPv6 communications protocols
 options        IPSEC_SUPPORT           # Allow kldload of ipsec and tcpmd5
 options        TCP_OFFLOAD             # TCP offload
 options        TCP_BLACKBOX            # Enhanced TCP event logging
 options        TCP_HHOOK               # hhook(9) framework for TCP
 options        TCP_RFC7413             # TCP Fast Open
 options        SCTP_SUPPORT            # Allow kldload of SCTP
-options        FFS                     #Berkeley Fast Filesystem
-options        SOFTUPDATES             #Enable FFS soft updates support
-options        UFS_ACL                 #Support for access control lists
-options        UFS_DIRHASH             #Improve performance on big directories
-options        UFS_GJOURNAL            #Enable gjournal-based UFS journaling
-options        QUOTA                   #Enable disk quotas for UFS
-options        MD_ROOT                 #MD is a potential root device
-options        MD_ROOT_MEM             #Enable use of initrd as MD root
-options        NFSCL                   #Network Filesystem Client
-options        NFSD                    #Network Filesystem Server
-options        NFSLOCKD                #Network Lock Manager
-options        NFS_ROOT                #NFS usable as root device
-options        MSDOSFS                 #MSDOS Filesystem
-options        CD9660                  #ISO 9660 Filesystem
-options        PROCFS                  #Process filesystem (requires PSEUDOFS)
-options        PSEUDOFS                #Pseudo-filesystem framework
-options        TMPFS                   #Efficient memory filesystem
-options        GEOM_PART_APM           #Apple Partition Maps.
-options        GEOM_PART_GPT           #GUID Partition Tables.
-options        GEOM_LABEL              #Provides labelization
-#options       COMPAT_FREEBSD32        #Compatible with FreeBSD/powerpcle 
binaries
+options        FFS                     # Berkeley Fast Filesystem
+options        SOFTUPDATES             # Enable FFS soft updates support
+options        UFS_ACL                 # Support for access control lists
+options        UFS_DIRHASH             # Improve performance on big directories
+options        UFS_GJOURNAL            # Enable gjournal-based UFS journaling
+options        QUOTA                   # Enable disk quotas for UFS
+options        MD_ROOT                 # MD is a potential root device
+options        MD_ROOT_MEM             # Enable use of initrd as MD root
+options        NFSCL                   # Network Filesystem Client
+options        NFSD                    # Network Filesystem Server
+options        NFSLOCKD                # Network Lock Manager
+options        NFS_ROOT                # NFS usable as root device
+options        MSDOSFS                 # MSDOS Filesystem
+options        CD9660                  # ISO 9660 Filesystem
+options        PROCFS                  # Process filesystem (requires PSEUDOFS)
+options        PSEUDOFS                # Pseudo-filesystem framework
+options        TMPFS                   # Efficient memory filesystem
+options        GEOM_PART_APM           # Apple Partition Maps.
+options        GEOM_PART_GPT           # GUID Partition Tables.
+options        GEOM_LABEL              # Provides labelization
+#options       COMPAT_FREEBSD32        # Compatible with FreeBSD/powerpcle 
binaries
 options                COMPAT_FREEBSD11        # Compatible with FreeBSD11
 options                COMPAT_FREEBSD12        # Compatible with FreeBSD12
 options        COMPAT_FREEBSD13        # Compatible with FreeBSD13
-options        SCSI_DELAY=5000         #Delay (in ms) before probing SCSI 
-options        KTRACE                  #ktrace(1) syscall trace support
-options        STACK                   #stack(9) support
-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        SCSI_DELAY=5000         # Delay (in ms) before probing SCSI 
+options        KTRACE                  # ktrace(1) syscall trace support
+options        STACK                   # stack(9) support
+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        HWPMC_HOOKS             # Necessary kernel hooks for hwpmc(4)
 options        AUDIT                   # Security event auditing
@@ -93,12 +93,12 @@ options     RCTL                    # Resource limits
 options        KDB                     # Enable kernel debugger support.
 options        KDB_TRACE               # Print a stack trace for a panic.
 # For full debugger support use (turn off in stable branch):
-options        DDB                     #Support DDB
-#options       DEADLKRES               #Enable the deadlock resolver
-options        INVARIANTS              #Enable calls of extra sanity checking
-options        INVARIANT_SUPPORT       #Extra sanity checks of internal 
structures, required by INVARIANTS
-options        WITNESS                 #Enable checks to detect deadlocks and 
cycles
-options        WITNESS_SKIPSPIN        #Don't run witness on spinlocks for 
speed
+options        DDB                     # Support DDB
+#options       DEADLKRES               # Enable the deadlock resolver
+options        INVARIANTS              # Enable calls of extra sanity checking
+options        INVARIANT_SUPPORT       # Extra sanity checks of internal 
structures, required by INVARIANTS
+options        WITNESS                 # Enable checks to detect deadlocks and 
cycles
+options        WITNESS_SKIPSPIN        # Don't run witness on spinlocks for 
speed
 options        MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
 options        VERBOSE_SYSINIT=0       # Support debug.verbose_sysinit, off by 
default
 
@@ -194,7 +194,7 @@ device              firmware        # firmware assist module
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
 # Note that 'bpf' is required for DHCP.
-device         bpf             #Berkeley packet filter
+device         bpf             # Berkeley packet filter
 
 # USB support
 options        USB_DEBUG       # enable debug msgs
diff --git a/sys/powerpc/conf/MPC85XXSPE b/sys/powerpc/conf/MPC85XXSPE
index 6445112af1d7..1741055357a8 100644
--- a/sys/powerpc/conf/MPC85XXSPE
+++ b/sys/powerpc/conf/MPC85XXSPE
@@ -11,7 +11,7 @@ ident         MPC85XXSPE
 machine                powerpc powerpcspe
 
 include        "dpaa/config.dpaa"
-makeoptions    DEBUG=-g                #Build kernel with gdb(1) debug symbols
+makeoptions    DEBUG=-g                # Build kernel with gdb(1) debug symbols
 makeoptions    WITH_CTF=1
 
 options        FPU_EMU

Reply via email to