From 4c5f4bdec5a3a4245b1dec1d271dd22841fffc2c Mon Sep 17 00:00:00 2001 From: ian Date: Sat, 17 May 2014 17:34:37 +0000 Subject: MFC 263301 In kernel config files, it is supposed to be 'options' not 'options', per long standing (but recently not so strictly enforced) convention. --- sys/mips/conf/ALCHEMY | 26 ++++++++--------- sys/mips/conf/AP121 | 6 ++-- sys/mips/conf/AP91 | 8 +++--- sys/mips/conf/AP93 | 8 +++--- sys/mips/conf/AP94 | 16 +++++------ sys/mips/conf/AP96 | 8 +++--- sys/mips/conf/AR71XX_BASE | 64 ++++++++++++++++++++--------------------- sys/mips/conf/AR724X_BASE | 60 +++++++++++++++++++------------------- sys/mips/conf/AR91XX_BASE | 56 ++++++++++++++++++------------------ sys/mips/conf/AR933X_BASE | 60 +++++++++++++++++++------------------- sys/mips/conf/AR934X_BASE | 60 +++++++++++++++++++------------------- sys/mips/conf/CARAMBOLA2 | 6 ++-- sys/mips/conf/ENH200 | 8 +++--- sys/mips/conf/PB47 | 10 +++---- sys/mips/conf/PB92 | 64 ++++++++++++++++++++--------------------- sys/mips/conf/PICOSTATION_M2HP | 8 +++--- sys/mips/conf/ROUTERSTATION | 8 +++--- sys/mips/conf/ROUTERSTATION_MFS | 8 +++--- sys/mips/conf/RSPRO | 8 +++--- sys/mips/conf/RSPRO_MFS | 8 +++--- sys/mips/conf/RSPRO_STANDALONE | 6 ++-- sys/mips/conf/RT305X | 44 ++++++++++++++-------------- sys/mips/conf/SENTRY5 | 28 +++++++++--------- sys/mips/conf/SWARM64_SMP | 4 +-- sys/mips/conf/SWARM_SMP | 4 +-- sys/mips/conf/TP-WN1043ND | 4 +-- sys/mips/conf/WZR-300HP | 16 +++++------ sys/mips/conf/XLRN32 | 6 ++-- sys/mips/conf/std.SWARM | 34 +++++++++++----------- sys/mips/conf/std.XLP | 10 +++---- 30 files changed, 328 insertions(+), 328 deletions(-) (limited to 'sys/mips') diff --git a/sys/mips/conf/ALCHEMY b/sys/mips/conf/ALCHEMY index 9b078f9..a4508ad 100644 --- a/sys/mips/conf/ALCHEMY +++ b/sys/mips/conf/ALCHEMY @@ -28,15 +28,15 @@ include "../alchemy/std.alchemy" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options DDB -options KDB +options DDB +options KDB -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options NFSCL #Network Filesystem Client -options NFS_ROOT #NFS usable as /, requires NFSCL -options PSEUDOFS #Pseudo-filesystem framework -# options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +options NFSCL #Network Filesystem Client +options NFS_ROOT #NFS usable as /, requires NFSCL +options PSEUDOFS #Pseudo-filesystem framework +# options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options BOOTP options BOOTP_NFSROOT @@ -48,15 +48,15 @@ options BOOTP_COMPAT # options SOFTUPDATES #Enable FFS soft updates support # options UFS_ACL #Support for access control lists # options UFS_DIRHASH #Improve performance on big directories -options ROOTDEVNAME=\"nfs:10.0.0.1:/mnt/bsd\" +options ROOTDEVNAME=\"nfs:10.0.0.1:/mnt/bsd\" # Debugging for use in -current #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 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 device loop device ether diff --git a/sys/mips/conf/AP121 b/sys/mips/conf/AP121 index ac4a3b6..81002d3 100644 --- a/sys/mips/conf/AP121 +++ b/sys/mips/conf/AP121 @@ -34,11 +34,11 @@ device etherswitch device arswitch # read MSDOS formatted disks - USB -#options MSDOSFS +#options MSDOSFS # Enable the uboot environment stuff rather then the # redboot stuff. -options AR71XX_ENV_UBOOT +options AR71XX_ENV_UBOOT # uzip - to boot natively from flash device geom_uncompress @@ -48,4 +48,4 @@ options GEOM_UNCOMPRESS device geom_map # Boot off of the rootfs, as defined in the geom_map setup. -options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\" +options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\" diff --git a/sys/mips/conf/AP91 b/sys/mips/conf/AP91 index c1c2077..42f099c 100644 --- a/sys/mips/conf/AP91 +++ b/sys/mips/conf/AP91 @@ -16,9 +16,9 @@ include "AR724X_BASE" ident "AP91" hints "AP91.hints" -options AR71XX_REALMEM=16*1024*1024 +options AR71XX_REALMEM=16*1024*1024 -options AR71XX_ENV_UBOOT +options AR71XX_ENV_UBOOT # Limit inlines makeoptions INLINE_LIMIT=768 @@ -37,8 +37,8 @@ options NO_SWAPPING # uncompress - to boot read-only lzma natively from flash device geom_uncompress -options GEOM_UNCOMPRESS -options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\" +options GEOM_UNCOMPRESS +options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\" # Not enough space for these.. nooptions INVARIANTS diff --git a/sys/mips/conf/AP93 b/sys/mips/conf/AP93 index 4315b1e..639f0eb 100644 --- a/sys/mips/conf/AP93 +++ b/sys/mips/conf/AP93 @@ -16,17 +16,17 @@ include "AR724X_BASE" ident "AP93" hints "AP93.hints" -options AR71XX_REALMEM=64*1024*1024 +options AR71XX_REALMEM=64*1024*1024 -options AR71XX_ENV_UBOOT +options AR71XX_ENV_UBOOT # For DOS - enable if required options MSDOSFS # uncompress - to boot read-only lzma natively from flash device geom_uncompress -options GEOM_UNCOMPRESS -options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\" +options GEOM_UNCOMPRESS +options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\" # Used for the static uboot partition map device geom_map diff --git a/sys/mips/conf/AP94 b/sys/mips/conf/AP94 index 091ec8b..505c154 100644 --- a/sys/mips/conf/AP94 +++ b/sys/mips/conf/AP94 @@ -20,16 +20,16 @@ hints "AP94.hints" # GEOM modules device geom_redboot # to get access to the SPI flash partitions device geom_uzip # compressed in-memory filesystem hackery! -options GEOM_UZIP +options GEOM_UZIP -options ROOTDEVNAME=\"ufs:md0.uzip\" -options AR71XX_REALMEM=32*1024*1024 +options ROOTDEVNAME=\"ufs:md0.uzip\" +options AR71XX_REALMEM=32*1024*1024 -options AR71XX_ENV_UBOOT +options AR71XX_ENV_UBOOT -# options MD_ROOT -# options MD_ROOT_SIZE="6144" +# options MD_ROOT +# options MD_ROOT_SIZE="6144" -options AR71XX_ATH_EEPROM # Fetch EEPROM/PCI config from flash -options ATH_EEPROM_FIRMWARE # Use EEPROM from flash +options AR71XX_ATH_EEPROM # Fetch EEPROM/PCI config from flash +options ATH_EEPROM_FIRMWARE # Use EEPROM from flash device firmware # Used by the above diff --git a/sys/mips/conf/AP96 b/sys/mips/conf/AP96 index 5254a68..fa8b3f7 100644 --- a/sys/mips/conf/AP96 +++ b/sys/mips/conf/AP96 @@ -17,17 +17,17 @@ include "AR71XX_BASE" ident "AP96" hints "AP96.hints" -options AR71XX_REALMEM=64*1024*1024 +options AR71XX_REALMEM=64*1024*1024 -options AR71XX_ENV_UBOOT +options AR71XX_ENV_UBOOT # For DOS - enable if required options MSDOSFS # uncompress - to boot read-only lzma natively from flash device geom_uncompress -options GEOM_UNCOMPRESS -options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\" +options GEOM_UNCOMPRESS +options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\" # Used for the static uboot partition map device geom_map diff --git a/sys/mips/conf/AR71XX_BASE b/sys/mips/conf/AR71XX_BASE index 69b10a2..b652506 100644 --- a/sys/mips/conf/AR71XX_BASE +++ b/sys/mips/conf/AR71XX_BASE @@ -11,8 +11,8 @@ machine mips mips ident AR71XX_BASE cpu CPU_MIPS4KC makeoptions KERNLOADADDR=0x80050000 -options HZ=1000 -options HWPMC_HOOKS +options HZ=1000 +options HWPMC_HOOKS files "../atheros/files.ar71xx" @@ -26,43 +26,43 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols # modules already built. makeoptions MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_pci" -options DDB -options KDB +options DDB +options KDB -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options INET6 # IPv6 +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +options INET6 # IPv6 -# options NFSCL #Network Filesystem Client +# options NFSCL #Network Filesystem Client -options PSEUDOFS #Pseudo-filesystem framework -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options PSEUDOFS #Pseudo-filesystem framework +options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -# options NFS_LEGACYRPC +# options NFS_LEGACYRPC # Debugging for use in -current -options INVARIANTS -options INVARIANT_SUPPORT -options WITNESS -options WITNESS_SKIPSPIN -options DEBUG_REDZONE -options DEBUG_MEMGUARD +options INVARIANTS +options INVARIANT_SUPPORT +options WITNESS +options WITNESS_SKIPSPIN +options DEBUG_REDZONE +options DEBUG_MEMGUARD 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 MSDOSFS # Read MSDOS filesystems; useful for USB/CF +# options MSDOSFS # Read MSDOS filesystems; useful for USB/CF device pci device ar71xx_pci # 802.11 framework -options IEEE80211_DEBUG -options IEEE80211_ALQ -options IEEE80211_SUPPORT_MESH +options IEEE80211_DEBUG +options IEEE80211_ALQ +options IEEE80211_SUPPORT_MESH # This option is currently broken for if_ath_tx. -options IEEE80211_SUPPORT_TDMA -options IEEE80211_AMPDU_AGE +options IEEE80211_SUPPORT_TDMA +options IEEE80211_AMPDU_AGE device wlan # 802.11 support device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support @@ -73,11 +73,11 @@ device wlan_xauth # 802.11 hostap support device ath # Atheros interface support device ath_pci # Atheros PCI/Cardbus bus options ATH_DEBUG -options ATH_DIAGAPI -options ATH_ENABLE_11N -options AH_DEBUG -options AH_DEBUG_ALQ -options ALQ +options ATH_DIAGAPI +options ATH_ENABLE_11N +options AH_DEBUG +options AH_DEBUG_ALQ +options ALQ device ath_hal option AH_SUPPORT_AR5416 device ath_rate_sample @@ -92,9 +92,9 @@ device mii device arge device usb -options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order -options USB_DEBUG -options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this +options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order +options USB_DEBUG +options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this device ehci device scbus @@ -119,7 +119,7 @@ device if_bridge device gif # ip[46] in ip[46] tunneling protocol device gre # generic encapsulation - only for IPv4 in IPv4 though atm -options ARGE_DEBUG # Enable if_arge debugging for now +options ARGE_DEBUG # Enable if_arge debugging for now # Enable GPIO device gpio diff --git a/sys/mips/conf/AR724X_BASE b/sys/mips/conf/AR724X_BASE index 7ffadb1..bec11e2 100644 --- a/sys/mips/conf/AR724X_BASE +++ b/sys/mips/conf/AR724X_BASE @@ -12,8 +12,8 @@ machine mips mips ident AR724X_BASE cpu CPU_MIPS4KC makeoptions KERNLOADADDR=0x80050000 -options HZ=1000 -options HWPMC_HOOKS +options HZ=1000 +options HWPMC_HOOKS files "../atheros/files.ar71xx" @@ -27,24 +27,24 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols # modules already built. makeoptions MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_pci hwpmc cam" -options DDB -options KDB +options DDB +options KDB -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking #options INET6 # IPv6 #options NFSCL #Network Filesystem Client -options PSEUDOFS #Pseudo-filesystem framework -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options PSEUDOFS #Pseudo-filesystem framework +options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -#options NFS_LEGACYRPC +#options NFS_LEGACYRPC # Debugging for use in -current -options INVARIANTS -options INVARIANT_SUPPORT -options WITNESS -options WITNESS_SKIPSPIN -options DEBUG_REDZONE -options DEBUG_MEMGUARD +options INVARIANTS +options INVARIANT_SUPPORT +options WITNESS +options WITNESS_SKIPSPIN +options DEBUG_REDZONE +options DEBUG_MEMGUARD # Don't include the SCSI/CAM strings in the default build options SCSI_NO_SENSE_STRINGS @@ -58,18 +58,18 @@ options NO_FFS_SNAPSHOT # options SOFTUPDATES #Enable FFS soft updates support # options UFS_ACL #Support for access control lists # options UFS_DIRHASH #Improve performance on big directories -# options MSDOSFS # Read MSDOS filesystems; useful for USB/CF +# options MSDOSFS # Read MSDOS filesystems; useful for USB/CF device pci device ar724x_pci # 802.11 framework -options IEEE80211_DEBUG -options IEEE80211_ALQ -options IEEE80211_SUPPORT_MESH -options IEEE80211_SUPPORT_SUPERG -options IEEE80211_SUPPORT_TDMA -options IEEE80211_AMPDU_AGE +options IEEE80211_DEBUG +options IEEE80211_ALQ +options IEEE80211_SUPPORT_MESH +options IEEE80211_SUPPORT_SUPERG +options IEEE80211_SUPPORT_TDMA +options IEEE80211_AMPDU_AGE #device wlan # 802.11 support #device wlan_wep # 802.11 WEP support #device wlan_ccmp # 802.11 CCMP support @@ -80,11 +80,11 @@ options IEEE80211_AMPDU_AGE #device ath # Atheros interface support #device ath_pci # Atheros PCI/Cardbus bus options ATH_DEBUG -options ATH_DIAGAPI -options ATH_ENABLE_11N -options AH_DEBUG -options AH_DEBUG_ALQ -options ALQ +options ATH_DIAGAPI +options ATH_ENABLE_11N +options AH_DEBUG +options AH_DEBUG_ALQ +options ALQ #device ath_hal option AH_SUPPORT_AR5416 #device ath_rate_sample @@ -100,9 +100,9 @@ device arge options ARGE_DEBUG # Enable if_arge debugging for now #device usb -options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order -options USB_DEBUG -options USB_HOST_ALIGN=32 # AR724X (MIPS in general?) requires this +options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order +options USB_DEBUG +options USB_HOST_ALIGN=32 # AR724X (MIPS in general?) requires this #device ehci #device umass diff --git a/sys/mips/conf/AR91XX_BASE b/sys/mips/conf/AR91XX_BASE index a84474d..5608562 100644 --- a/sys/mips/conf/AR91XX_BASE +++ b/sys/mips/conf/AR91XX_BASE @@ -14,7 +14,7 @@ machine mips mips ident AR91XX_BASE cpu CPU_MIPS4KC makeoptions KERNLOADADDR=0x80050000 -options HZ=1000 +options HZ=1000 files "../atheros/files.ar71xx" hints "AR91XX_BASE.hints" @@ -22,38 +22,38 @@ hints "AR91XX_BASE.hints" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_ahb hwpmc" -options DDB -options KDB +options DDB +options KDB options ALQ -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options INET6 #InterNETworking -#options NFSCL #Network Filesystem Client -options PSEUDOFS #Pseudo-filesystem framework -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +options INET6 #InterNETworking +#options NFSCL #Network Filesystem Client +options PSEUDOFS #Pseudo-filesystem framework +options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions # PMC -options HWPMC_HOOKS +options HWPMC_HOOKS device hwpmc device hwpmc_mips24k -# options NFS_LEGACYRPC +# options NFS_LEGACYRPC # Debugging for use in -current -options INVARIANTS -options INVARIANT_SUPPORT -options WITNESS -options WITNESS_SKIPSPIN -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 NO_FFS_SNAPSHOT # We don't require snapshot support +options INVARIANTS +options INVARIANT_SUPPORT +options WITNESS +options WITNESS_SKIPSPIN +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 NO_FFS_SNAPSHOT # We don't require snapshot support # Wireless NIC cards -options IEEE80211_DEBUG -options IEEE80211_SUPPORT_MESH -options IEEE80211_SUPPORT_TDMA +options IEEE80211_DEBUG +options IEEE80211_SUPPORT_MESH +options IEEE80211_SUPPORT_TDMA options IEEE80211_ALQ # 802.11 ALQ logging support device wlan # 802.11 support device wlan_wep # 802.11 WEP support @@ -66,7 +66,7 @@ device ath # Atheros network device device ath_rate_sample device ath_ahb # Atheros host bus glue options ATH_DEBUG -options ATH_DIAGAPI +options ATH_DIAGAPI option ATH_ENABLE_11N option AH_DEBUG_ALQ @@ -80,7 +80,7 @@ device ath_ar5212 device ath_ar5416 device ath_ar9130 -options AH_DEBUG +options AH_DEBUG option AH_SUPPORT_AR5416 option AH_SUPPORT_AR9130 # Makes other chipsets not function! option AH_DEBUG_ALQ @@ -91,9 +91,9 @@ device mii device arge device usb -options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order -options USB_DEBUG -options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this +options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order +options USB_DEBUG +options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this device ehci device scbus diff --git a/sys/mips/conf/AR933X_BASE b/sys/mips/conf/AR933X_BASE index 282f3b3..7190017 100644 --- a/sys/mips/conf/AR933X_BASE +++ b/sys/mips/conf/AR933X_BASE @@ -14,7 +14,7 @@ machine mips mips ident AR933X_BASE cpu CPU_MIPS4KC makeoptions KERNLOADADDR=0x80050000 -options HZ=1000 +options HZ=1000 files "../atheros/files.ar71xx" hints "AR933X_BASE.hints" @@ -23,16 +23,16 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols # makeoptions MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_ahb hwpmc" makeoptions MODULES_OVERRIDE="" -options DDB -options KDB +options DDB +options KDB options ALQ -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -#options INET6 #InterNETworking -#options NFSCL #Network Filesystem Client -options PSEUDOFS #Pseudo-filesystem framework -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +#options INET6 #InterNETworking +#options NFSCL #Network Filesystem Client +options PSEUDOFS #Pseudo-filesystem framework +options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions # Don't include the SCSI/CAM strings in the default build options SCSI_NO_SENSE_STRINGS @@ -42,33 +42,33 @@ options SCSI_NO_OP_STRINGS options NO_SYSCTL_DESCR # Limit IO size -options NBUF=128 +options NBUF=128 # Limit UMTX hash size -# options UMTX_NUM_CHAINS=64 +# options UMTX_NUM_CHAINS=64 # PMC -#options HWPMC_HOOKS +#options HWPMC_HOOKS #device hwpmc #device hwpmc_mips24k -# options NFS_LEGACYRPC +# options NFS_LEGACYRPC # Debugging for use in -current -#options INVARIANTS -#options INVARIANT_SUPPORT -#options WITNESS -#options WITNESS_SKIPSPIN -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 NO_FFS_SNAPSHOT # We don't require snapshot support +#options INVARIANTS +#options INVARIANT_SUPPORT +#options WITNESS +#options WITNESS_SKIPSPIN +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 NO_FFS_SNAPSHOT # We don't require snapshot support # Wireless NIC cards -options IEEE80211_DEBUG -options IEEE80211_SUPPORT_MESH -options IEEE80211_SUPPORT_TDMA -options IEEE80211_SUPPORT_SUPERG +options IEEE80211_DEBUG +options IEEE80211_SUPPORT_MESH +options IEEE80211_SUPPORT_TDMA +options IEEE80211_SUPPORT_SUPERG options IEEE80211_ALQ # 802.11 ALQ logging support device wlan # 802.11 support device wlan_wep # 802.11 WEP support @@ -81,7 +81,7 @@ device ath # Atheros network device device ath_rate_sample device ath_ahb # Atheros host bus glue options ATH_DEBUG -options ATH_DIAGAPI +options ATH_DIAGAPI option ATH_ENABLE_11N option AH_DEBUG_ALQ @@ -97,9 +97,9 @@ device mii device arge device usb -options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order -options USB_DEBUG -options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this +options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order +options USB_DEBUG +options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this device ehci device scbus diff --git a/sys/mips/conf/AR934X_BASE b/sys/mips/conf/AR934X_BASE index 22ba0b8..c66ea90 100644 --- a/sys/mips/conf/AR934X_BASE +++ b/sys/mips/conf/AR934X_BASE @@ -14,7 +14,7 @@ machine mips mips ident AR934X_BASE cpu CPU_MIPS74KC makeoptions KERNLOADADDR=0x80050000 -options HZ=1000 +options HZ=1000 files "../atheros/files.ar71xx" hints "AR934X_BASE.hints" @@ -23,16 +23,16 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols # makeoptions MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_ahb hwpmc" makeoptions MODULES_OVERRIDE="" -options DDB -options KDB +options DDB +options KDB options ALQ -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -#options INET6 #InterNETworking -#options NFSCL #Network Filesystem Client -options PSEUDOFS #Pseudo-filesystem framework -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +#options INET6 #InterNETworking +#options NFSCL #Network Filesystem Client +options PSEUDOFS #Pseudo-filesystem framework +options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions # Don't include the SCSI/CAM strings in the default build options SCSI_NO_SENSE_STRINGS @@ -42,33 +42,33 @@ options SCSI_NO_OP_STRINGS options NO_SYSCTL_DESCR # Limit IO size -options NBUF=128 +options NBUF=128 # Limit UMTX hash size -# options UMTX_NUM_CHAINS=64 +# options UMTX_NUM_CHAINS=64 # PMC -#options HWPMC_HOOKS +#options HWPMC_HOOKS #device hwpmc #device hwpmc_mips24k -# options NFS_LEGACYRPC +# options NFS_LEGACYRPC # Debugging for use in -current -#options INVARIANTS -#options INVARIANT_SUPPORT -#options WITNESS -#options WITNESS_SKIPSPIN -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 NO_FFS_SNAPSHOT # We don't require snapshot support +#options INVARIANTS +#options INVARIANT_SUPPORT +#options WITNESS +#options WITNESS_SKIPSPIN +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 NO_FFS_SNAPSHOT # We don't require snapshot support # Wireless NIC cards -options IEEE80211_DEBUG -options IEEE80211_SUPPORT_MESH -options IEEE80211_SUPPORT_TDMA -options IEEE80211_SUPPORT_SUPERG +options IEEE80211_DEBUG +options IEEE80211_SUPPORT_MESH +options IEEE80211_SUPPORT_TDMA +options IEEE80211_SUPPORT_SUPERG options IEEE80211_ALQ # 802.11 ALQ logging support device wlan # 802.11 support device wlan_wep # 802.11 WEP support @@ -81,7 +81,7 @@ device ath # Atheros network device device ath_rate_sample device ath_ahb # Atheros host bus glue options ATH_DEBUG -options ATH_DIAGAPI +options ATH_DIAGAPI option ATH_ENABLE_11N option AH_DEBUG_ALQ @@ -97,9 +97,9 @@ device mii device arge device usb -options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order -options USB_DEBUG -options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this +options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order +options USB_DEBUG +options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this device ehci device scbus diff --git a/sys/mips/conf/CARAMBOLA2 b/sys/mips/conf/CARAMBOLA2 index 25566c9..78c212a 100644 --- a/sys/mips/conf/CARAMBOLA2 +++ b/sys/mips/conf/CARAMBOLA2 @@ -36,11 +36,11 @@ device etherswitch device arswitch # read MSDOS formatted disks - USB -#options MSDOSFS +#options MSDOSFS # Enable the uboot environment stuff rather then the # redboot stuff. -options AR71XX_ENV_UBOOT +options AR71XX_ENV_UBOOT # uzip - to boot natively from flash device geom_uncompress @@ -50,4 +50,4 @@ options GEOM_UNCOMPRESS device geom_map # Boot off of the rootfs, as defined in the geom_map setup. -options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\" +options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\" diff --git a/sys/mips/conf/ENH200 b/sys/mips/conf/ENH200 index 886397f..bb88694 100644 --- a/sys/mips/conf/ENH200 +++ b/sys/mips/conf/ENH200 @@ -16,17 +16,17 @@ include "AR724X_BASE" ident "ENH200" hints "ENH200.hints" -options AR71XX_REALMEM=32*1024*1024 +options AR71XX_REALMEM=32*1024*1024 -options AR71XX_ENV_UBOOT +options AR71XX_ENV_UBOOT # For DOS - enable if required options MSDOSFS # uncompress - to boot read-only lzma natively from flash device geom_uncompress -options GEOM_UNCOMPRESS -options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\" +options GEOM_UNCOMPRESS +options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\" # Used for the static uboot partition map device geom_map diff --git a/sys/mips/conf/PB47 b/sys/mips/conf/PB47 index f006405..65e54fd 100644 --- a/sys/mips/conf/PB47 +++ b/sys/mips/conf/PB47 @@ -19,22 +19,22 @@ hints "PB47.hints" # Enable the uboot environment stuff rather then the # redboot stuff. -options AR71XX_ENV_UBOOT +options AR71XX_ENV_UBOOT # XXX TODO: add uboot boot parameter parsing to extract MAC, RAM. # Right now it will just detect 32mb out of 64mb, as well as # return a garbage MAC address. -options AR71XX_REALMEM=64*1024*1024 +options AR71XX_REALMEM=64*1024*1024 # For DOS - enable if required -options MSDOSFS +options MSDOSFS # uncompress - to boot read-only lzma natively from flash device geom_uncompress -options GEOM_UNCOMPRESS +options GEOM_UNCOMPRESS # Used for the static uboot partition map device geom_map # Boot off of the rootfs, as defined in the geom_map setup. -options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\" +options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\" diff --git a/sys/mips/conf/PB92 b/sys/mips/conf/PB92 index 2ca7cfe..b634cae 100644 --- a/sys/mips/conf/PB92 +++ b/sys/mips/conf/PB92 @@ -8,13 +8,13 @@ ident PB92 # XXX The default load address in the Uboot environment is 0x80010000 makeoptions KERNLOADADDR=0x80050000 -options HZ=1000 +options HZ=1000 # The PB92 has 32mb of RAM; hard-code that -options AR71XX_REALMEM=32*1024*1024 +options AR71XX_REALMEM=32*1024*1024 # It's UBOOT, not Redboot - without this, things will hang at startup -options AR71XX_ENV_UBOOT +options AR71XX_ENV_UBOOT # We have to build most things as modules rather than in the kernel. # The PB92 has 4MB of SPI flash and the default kernel "partition" @@ -30,24 +30,24 @@ include "../atheros/std.ar71xx" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions MODULES_OVERRIDE="" -options DDB -options KDB +options DDB +options KDB -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking # Can't do IPv6 - it just doesn't fit. -# options INET6 -# options NFSCL #Network Filesystem Client -options PSEUDOFS #Pseudo-filesystem framework -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -options ALQ +# options INET6 +# options NFSCL #Network Filesystem Client +options PSEUDOFS #Pseudo-filesystem framework +options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options ALQ # Debugging for use in -current -options DEADLKRES -options INVARIANTS -options INVARIANT_SUPPORT -options WITNESS -options WITNESS_SKIPSPIN +options DEADLKRES +options INVARIANTS +options INVARIANT_SUPPORT +options WITNESS +options WITNESS_SKIPSPIN options FFS #Berkeley Fast Filesystem #options SOFTUPDATES #Enable FFS soft updates support #options UFS_ACL #Support for access control lists @@ -55,8 +55,8 @@ options FFS #Berkeley Fast Filesystem # Support uncompress lzma rootfs device geom_uncompress -options GEOM_UNCOMPRESS -options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\" +options GEOM_UNCOMPRESS +options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\" # PCI bus device pci @@ -66,10 +66,10 @@ device ar724x_pci device nvram2env # Wireless NIC cards -options IEEE80211_DEBUG -options IEEE80211_SUPPORT_MESH -options IEEE80211_SUPPORT_TDMA -options IEEE80211_ALQ +options IEEE80211_DEBUG +options IEEE80211_SUPPORT_MESH +options IEEE80211_SUPPORT_TDMA +options IEEE80211_ALQ #device wlan # 802.11 support #device wlan_wep # 802.11 WEP support #device wlan_ccmp # 802.11 CCMP support @@ -79,13 +79,13 @@ options IEEE80211_ALQ #device ath # Atheros pci/cardbus NIC's #device ath_pci # PCI/PCIe bus glue options ATH_DEBUG -options ATH_ENABLE_11N -options ATH_DIAGAPI +options ATH_ENABLE_11N +options ATH_DIAGAPI # device ath_hal -options AH_SUPPORT_AR5416 -options AH_DEBUG -options AH_DEBUG_ALQ +options AH_SUPPORT_AR5416 +options AH_DEBUG +options AH_DEBUG_ALQ # device ath_rate_sample @@ -95,9 +95,9 @@ device arge # USB devices - PB92 has EHCI only #device usb -options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order -options USB_DEBUG -options USB_HOST_ALIGN=32 +options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order +options USB_DEBUG +options USB_HOST_ALIGN=32 #device ehci # Mass storage @@ -106,7 +106,7 @@ options USB_HOST_ALIGN=32 #device da # Read MSDOS formatted disks -# options MSDOSFS +# options MSDOSFS # GPIO Bus #device gpio diff --git a/sys/mips/conf/PICOSTATION_M2HP b/sys/mips/conf/PICOSTATION_M2HP index 0f5ac17..da6228b 100644 --- a/sys/mips/conf/PICOSTATION_M2HP +++ b/sys/mips/conf/PICOSTATION_M2HP @@ -16,9 +16,9 @@ include "AR724X_BASE" ident "PICOSTATION_M2HP" hints "PICOSTATION_M2HP.hints" -options AR71XX_REALMEM=32*1024*1024 +options AR71XX_REALMEM=32*1024*1024 -options AR71XX_ENV_UBOOT +options AR71XX_ENV_UBOOT # Limit inlines makeoptions INLINE_LIMIT=768 @@ -37,8 +37,8 @@ options NO_SWAPPING # uncompress - to boot read-only lzma natively from flash device geom_uncompress -options GEOM_UNCOMPRESS -options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\" +options GEOM_UNCOMPRESS +options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\" # Not enough space for these.. nooptions INVARIANTS diff --git a/sys/mips/conf/ROUTERSTATION b/sys/mips/conf/ROUTERSTATION index dded480..a680c26 100644 --- a/sys/mips/conf/ROUTERSTATION +++ b/sys/mips/conf/ROUTERSTATION @@ -13,16 +13,16 @@ hints "ROUTERSTATION.hints" # GEOM modules device geom_redboot # to get access to the SPI flash partitions device geom_uzip # compressed in-memory filesystem support -options GEOM_UZIP +options GEOM_UZIP # For DOS -options MSDOSFS +options MSDOSFS # Etherswitch support -options ARGE_MDIO +options ARGE_MDIO device miiproxy device etherswitch device ukswitch # Boot path - redboot MFS -options ROOTDEVNAME=\"ufs:redboot/rootfs.uzip\" +options ROOTDEVNAME=\"ufs:redboot/rootfs.uzip\" diff --git a/sys/mips/conf/ROUTERSTATION_MFS b/sys/mips/conf/ROUTERSTATION_MFS index 087659b..6c0f0f1 100644 --- a/sys/mips/conf/ROUTERSTATION_MFS +++ b/sys/mips/conf/ROUTERSTATION_MFS @@ -11,9 +11,9 @@ hints "ROUTERSTATION.hints" # GEOM modules device geom_redboot # to get access to the SPI flash partitions device geom_uzip # compressed in-memory filesystem hackery! -options GEOM_UZIP +options GEOM_UZIP -options ROOTDEVNAME=\"ufs:md0.uzip\" +options ROOTDEVNAME=\"ufs:md0.uzip\" -options MD_ROOT -options MD_ROOT_SIZE="6144" +options MD_ROOT +options MD_ROOT_SIZE="6144" diff --git a/sys/mips/conf/RSPRO b/sys/mips/conf/RSPRO index bdb606c..d5a5405 100644 --- a/sys/mips/conf/RSPRO +++ b/sys/mips/conf/RSPRO @@ -14,17 +14,17 @@ device pcf2123_rtc # GEOM modules device geom_redboot # to get access to the SPI flash partitions device geom_uzip # compressed in-memory filesystem support -options GEOM_UZIP +options GEOM_UZIP # For DOS -options MSDOSFS +options MSDOSFS # For etherswitch support -options ARGE_MDIO +options ARGE_MDIO device miiproxy device etherswitch device arswitch # Boot off of flash -options ROOTDEVNAME=\"ufs:redboot/rootfs.uzip\" +options ROOTDEVNAME=\"ufs:redboot/rootfs.uzip\" diff --git a/sys/mips/conf/RSPRO_MFS b/sys/mips/conf/RSPRO_MFS index b9598f1..f0c9b5b 100644 --- a/sys/mips/conf/RSPRO_MFS +++ b/sys/mips/conf/RSPRO_MFS @@ -14,10 +14,10 @@ device pcf2123_rtc # GEOM modules device geom_redboot # to get access to the SPI flash partitions device geom_uzip # compressed in-memory filesystem hackery! -options GEOM_UZIP +options GEOM_UZIP # Boot from the first MFS uzip -options ROOTDEVNAME=\"ufs:md0.uzip\" +options ROOTDEVNAME=\"ufs:md0.uzip\" -options MD_ROOT -options MD_ROOT_SIZE="6144" +options MD_ROOT +options MD_ROOT_SIZE="6144" diff --git a/sys/mips/conf/RSPRO_STANDALONE b/sys/mips/conf/RSPRO_STANDALONE index 2a7014f..24b2750 100644 --- a/sys/mips/conf/RSPRO_STANDALONE +++ b/sys/mips/conf/RSPRO_STANDALONE @@ -15,10 +15,10 @@ device pcf2123_rtc # GEOM modules device geom_redboot # to get access to the SPI flash partitions device geom_uzip # compressed in-memory filesystem support -options GEOM_UZIP +options GEOM_UZIP # For DOS -options MSDOSFS +options MSDOSFS # .. first DOS-partitioned, BSD sliced flash disk -options ROOTDEVNAME=\"ufs:da0s1a\" +options ROOTDEVNAME=\"ufs:da0s1a\" diff --git a/sys/mips/conf/RT305X b/sys/mips/conf/RT305X index 6527782..9d6ea17 100644 --- a/sys/mips/conf/RT305X +++ b/sys/mips/conf/RT305X @@ -35,10 +35,10 @@ hints "RT305X.hints" #Default places to look for devices. # Debugging for use in -current #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 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 DIAGNOSTIC #options DEBUG_LOCKS #options DEBUG_VFS_LOCKS @@ -48,7 +48,7 @@ options KDB options SCHED_ULE #options SCHED_4BSD #4BSD scheduler -#options COMPAT_43 +#options COMPAT_43 options INET #InterNETworking options NFSCL #Network Filesystem Client options NFS_ROOT #NFS usable as /, requires NFSCL @@ -61,7 +61,7 @@ options BOOTP_NFSV3 options BOOTP_WIRED_TO=rt0 options BOOTP_COMPAT options CD9660 # ISO 9660 Filesystem -options ROOTDEVNAME=\"cd9660:/dev/map/rootfs.uncompress\" +options ROOTDEVNAME=\"cd9660:/dev/map/rootfs.uncompress\" options TMPFS # TMP Memory Filesystem #options FFS #Berkeley Fast Filesystem @@ -72,22 +72,22 @@ options TMPFS # TMP Memory Filesystem # Options for making kernel less hangry makeoptions INLINE_LIMIT=1024 -options MAXUSERS=3 -options MAXFILES=512 -options NSFBUFS=256 -options SHMALL=128 -options MSGBUF_SIZE=65536 +options MAXUSERS=3 +options MAXFILES=512 +options NSFBUFS=256 +options SHMALL=128 +options MSGBUF_SIZE=65536 # Options for making kernel smallest -options NO_SYSCTL_DESCR # No description string of sysctl -#options NO_FFS_SNAPSHOT # Disable Snapshot supporting -options SCSI_NO_SENSE_STRINGS -options SCSI_NO_OP_STRINGS -options RWLOCK_NOINLINE -options SX_NOINLINE -options NO_SWAPPING +options NO_SYSCTL_DESCR # No description string of sysctl +#options NO_FFS_SNAPSHOT # Disable Snapshot supporting +options SCSI_NO_SENSE_STRINGS +options SCSI_NO_OP_STRINGS +options RWLOCK_NOINLINE +options SX_NOINLINE +options NO_SWAPPING options MROUTING # Multicast routing -options IPFIREWALL_DEFAULT_TO_ACCEPT +options IPFIREWALL_DEFAULT_TO_ACCEPT device random device loop @@ -125,8 +125,8 @@ device usb #device scbus options SCSI_DELAY=1000 # Delay (in ms) before probing SCSI -#options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order -#options USB_DEBUG -#options USB_REQ_DEBUG +#options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order +#options USB_DEBUG +#options USB_REQ_DEBUG diff --git a/sys/mips/conf/SENTRY5 b/sys/mips/conf/SENTRY5 index 9436441..dadf790 100644 --- a/sys/mips/conf/SENTRY5 +++ b/sys/mips/conf/SENTRY5 @@ -32,27 +32,27 @@ hints "SENTRY5.hints" include "../sentry5/std.sentry5" # sentry5 normally ships with cfe firmware; use the console for now -options CFE -options CFE_CONSOLE -options ALT_BREAK_TO_DEBUGGER +options CFE +options CFE_CONSOLE +options ALT_BREAK_TO_DEBUGGER makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions MODULES_OVERRIDE="" -options DDB -options KDB +options DDB +options KDB -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options NFSCL #Network Filesystem Client -options NFS_ROOT #NFS usable as /, requires NFSCL -options PSEUDOFS #Pseudo-filesystem framework -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +options NFSCL #Network Filesystem Client +options NFS_ROOT #NFS usable as /, requires NFSCL +options PSEUDOFS #Pseudo-filesystem framework +options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions # Debugging for use in -current #options DEADLKRES -options INVARIANTS -options INVARIANT_SUPPORT +options INVARIANTS +options INVARIANT_SUPPORT #options BUS_DEBUG #makeoptions BUS_DEBUG @@ -68,7 +68,7 @@ device pci # siba_pcib #device ath # in pci slot #device ath_pci # Atheros pci/cardbus glue #device ath_hal # pci chip support -#options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +#options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors options USB_DEBUG # enable debug msgs device usb # USB Bus (required) diff --git a/sys/mips/conf/SWARM64_SMP b/sys/mips/conf/SWARM64_SMP index b4cd666..870caca 100644 --- a/sys/mips/conf/SWARM64_SMP +++ b/sys/mips/conf/SWARM64_SMP @@ -6,8 +6,8 @@ include "std.SWARM" ident SWARM64_SMP -options SMP -options PRINTF_BUFR_SIZE=128 +options SMP +options PRINTF_BUFR_SIZE=128 machine mips mips64 makeoptions ARCH_FLAGS="-mabi=64 -march=mips64" diff --git a/sys/mips/conf/SWARM_SMP b/sys/mips/conf/SWARM_SMP index d4f1541..cc54880 100644 --- a/sys/mips/conf/SWARM_SMP +++ b/sys/mips/conf/SWARM_SMP @@ -6,8 +6,8 @@ include "std.SWARM" ident SWARM_SMP -options SMP -options PRINTF_BUFR_SIZE=128 +options SMP +options PRINTF_BUFR_SIZE=128 machine mips mips diff --git a/sys/mips/conf/TP-WN1043ND b/sys/mips/conf/TP-WN1043ND index 5493d0f..ed3309c 100644 --- a/sys/mips/conf/TP-WN1043ND +++ b/sys/mips/conf/TP-WN1043ND @@ -28,11 +28,11 @@ device etherswitch device rtl8366rb # read MSDOS formatted disks - USB -options MSDOSFS +options MSDOSFS # Enable the uboot environment stuff rather then the # redboot stuff. -options AR71XX_ENV_UBOOT +options AR71XX_ENV_UBOOT # uncompress - to boot natively from flash device geom_uncompress diff --git a/sys/mips/conf/WZR-300HP b/sys/mips/conf/WZR-300HP index aff305e..ce86403 100644 --- a/sys/mips/conf/WZR-300HP +++ b/sys/mips/conf/WZR-300HP @@ -16,11 +16,11 @@ include "AR724X_BASE" ident "WZR-300HP" hints "WZR-300HP.hints" -options AR71XX_REALMEM=64*1024*1024 +options AR71XX_REALMEM=64*1024*1024 -options AR71XX_ENV_UBOOT +options AR71XX_ENV_UBOOT -options BOOTVERBOSE +options BOOTVERBOSE # Don't include the SCSI/CAM strings in the default build options SCSI_NO_SENSE_STRINGS options SCSI_NO_OP_STRINGS @@ -32,13 +32,13 @@ options NO_SYSCTL_DESCR device geom_map # to get access to the SPI flash partitions device geom_uncompress # compressed in-memory filesystem hackery! -options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\" +options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\" -# options MD_ROOT -# options MD_ROOT_SIZE="6144" +# options MD_ROOT +# options MD_ROOT_SIZE="6144" -options AR71XX_ATH_EEPROM # Fetch EEPROM/PCI config from flash -options ATH_EEPROM_FIRMWARE # Use EEPROM from flash +options AR71XX_ATH_EEPROM # Fetch EEPROM/PCI config from flash +options ATH_EEPROM_FIRMWARE # Use EEPROM from flash device firmware # Used by the above # Options required for miiproxy and mdiobus diff --git a/sys/mips/conf/XLRN32 b/sys/mips/conf/XLRN32 index d81eaf9..c23b451 100644 --- a/sys/mips/conf/XLRN32 +++ b/sys/mips/conf/XLRN32 @@ -40,15 +40,15 @@ 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 NFSCL -options NFS_ROOT +options NFSCL +options NFS_ROOT # options BOOTP options BOOTP_NFSROOT options BOOTP_NFSV3 options BOOTP_WIRED_TO=nlge0 options BOOTP_COMPAT -options ROOTDEVNAME=\"nfs:10.1.1.8:/usr/extra/nfsroot\" +options ROOTDEVNAME=\"nfs:10.1.1.8:/usr/extra/nfsroot\" # #options MD_ROOT # MD is a potential root device #options MD_ROOT_SIZE=27000 diff --git a/sys/mips/conf/std.SWARM b/sys/mips/conf/std.SWARM index 0405b0a..c737905 100644 --- a/sys/mips/conf/std.SWARM +++ b/sys/mips/conf/std.SWARM @@ -5,35 +5,35 @@ hints "SWARM.hints" include "../sibyte/std.sibyte" -options CFE -options CFE_CONSOLE -options CFE_ENV -options ALT_BREAK_TO_DEBUGGER +options CFE +options CFE_CONSOLE +options CFE_ENV +options ALT_BREAK_TO_DEBUGGER cpu CPU_SB1 makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions MODULES_OVERRIDE="" -options DDB -options KDB +options DDB +options KDB -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options NFSCL #Network Filesystem Client -options NFS_ROOT #NFS usable as /, requires NFSCL -options PSEUDOFS #Pseudo-filesystem framework -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +options NFSCL #Network Filesystem Client +options NFS_ROOT #NFS usable as /, requires NFSCL +options PSEUDOFS #Pseudo-filesystem framework +options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions # Debugging for use in -current #options DEADLKRES -options INVARIANTS -options INVARIANT_SUPPORT -options WITNESS +options INVARIANTS +options INVARIANT_SUPPORT +options WITNESS options FFS #Fast filesystem -options KTRACE +options KTRACE device pci device miibus @@ -43,7 +43,7 @@ device ether device md device random -options USB_DEBUG +options USB_DEBUG device usb device ohci device uhci diff --git a/sys/mips/conf/std.XLP b/sys/mips/conf/std.XLP index bf5fbe8..3d249bc 100644 --- a/sys/mips/conf/std.XLP +++ b/sys/mips/conf/std.XLP @@ -19,9 +19,9 @@ 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 NFSCL -options NFS_ROOT -options MSDOSFS #MSDOS Filesystem +options NFSCL +options NFS_ROOT +options MSDOSFS #MSDOS Filesystem # #options BOOTP #options BOOTP_NFSROOT @@ -31,8 +31,8 @@ options MSDOSFS #MSDOS Filesystem #options ROOTDEVNAME=\"nfs:10.1.1.8:/usr/extra/nfsroot\" options MD_ROOT # MD is a potential root device -options MD_ROOT_SIZE=132000 -options ROOTDEVNAME=\"ufs:md0\" +options MD_ROOT_SIZE=132000 +options ROOTDEVNAME=\"ufs:md0\" options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options HZ=1000 options NO_SWAPPING -- cgit v1.1