Date: Fri, 13 Feb 2015 15:27:47 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r278676 - stable/10/sys/arm/conf Message-ID: <201502131527.t1DFRlVs029644@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Fri Feb 13 15:27:46 2015 New Revision: 278676 URL: https://svnweb.freebsd.org/changeset/base/278676 Log: MFC r266647, r270912, r273089: Reduce the diff between the PandaBoard and BeableBone kernel configs Resync comments about scbus and pass for life after AHCI joined CAM. Uncomment general options from the Pandaboard config. These are in other configs and there is no reason for them not to be here. Modified: stable/10/sys/arm/conf/BEAGLEBONE stable/10/sys/arm/conf/CNS11XXNAS stable/10/sys/arm/conf/CUBIEBOARD stable/10/sys/arm/conf/CUBIEBOARD2 stable/10/sys/arm/conf/DIGI-CCWMX53 stable/10/sys/arm/conf/EB9200 stable/10/sys/arm/conf/EFIKA_MX stable/10/sys/arm/conf/EXYNOS5.common stable/10/sys/arm/conf/HL200 stable/10/sys/arm/conf/HL201 stable/10/sys/arm/conf/IMX53-QSB stable/10/sys/arm/conf/IMX6 stable/10/sys/arm/conf/KB920X stable/10/sys/arm/conf/NSLU stable/10/sys/arm/conf/PANDABOARD stable/10/sys/arm/conf/QILA9G20 stable/10/sys/arm/conf/SAM9G20EK stable/10/sys/arm/conf/SAM9X25EK stable/10/sys/arm/conf/SN9G45 stable/10/sys/arm/conf/VYBRID stable/10/sys/arm/conf/ZEDBOARD Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/conf/BEAGLEBONE ============================================================================== --- stable/10/sys/arm/conf/BEAGLEBONE Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/BEAGLEBONE Fri Feb 13 15:27:46 2015 (r278676) @@ -53,7 +53,7 @@ options PREEMPTION options FREEBSD_BOOT_LOADER options VFP # vfp/neon -# Debugging +# Debugging for use in -current makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options BREAK_TO_DEBUGGER #options VERBOSE_SYSINIT # Enable verbose sysinit messages @@ -78,12 +78,17 @@ options NFSLOCKD #options BOOTP_NFSV3 #options BOOTP_WIRED_TO=cpsw0 - -# MMC/SD/SDIO card slot support +# MMC/SD/SDIO Card slot support device mmc # mmc/sd bus device mmcsd # mmc/sd flash cards device sdhci # mmc/sd host controller +# I2C support +device iicbus +device iic +device ti_i2c +device am335x_pmic # AM335x Power Management IC (TPC65217) + # Boot device is 2nd slice on MMC/SD card options ROOTDEVNAME=\"ufs:mmcsd0s2\" @@ -97,12 +102,6 @@ device snp device md device random # Entropy device -# I2C support -device iicbus -device iic -device ti_i2c -device am335x_pmic # AM335x Power Management IC (TPC65217) - # GPIO device gpio device gpioled @@ -124,13 +123,13 @@ device ti_mbox # USB support device usb -options USB_HOST_ALIGN=64 # Cacheline size is 64 on AM335x. +options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. options USB_DEBUG #options USB_REQ_DEBUG #options USB_VERBOSE device musb device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) # Ethernet @@ -141,7 +140,7 @@ device smscphy device cpsw device bpf -# USB ethernet support, requires miibus +# USB Ethernet support, requires miibus device miibus device axe # ASIX Electronics USB Ethernet Modified: stable/10/sys/arm/conf/CNS11XXNAS ============================================================================== --- stable/10/sys/arm/conf/CNS11XXNAS Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/CNS11XXNAS Fri Feb 13 15:27:46 2015 (r278676) @@ -111,7 +111,7 @@ device usb device ohci device ehci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass device cfi Modified: stable/10/sys/arm/conf/CUBIEBOARD ============================================================================== --- stable/10/sys/arm/conf/CUBIEBOARD Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/CUBIEBOARD Fri Feb 13 15:27:46 2015 (r278676) @@ -104,7 +104,7 @@ device random # Entropy device # GPIO device gpio -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass Modified: stable/10/sys/arm/conf/CUBIEBOARD2 ============================================================================== --- stable/10/sys/arm/conf/CUBIEBOARD2 Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/CUBIEBOARD2 Fri Feb 13 15:27:46 2015 (r278676) @@ -104,7 +104,7 @@ device random # Entropy device # GPIO device gpio -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass Modified: stable/10/sys/arm/conf/DIGI-CCWMX53 ============================================================================== --- stable/10/sys/arm/conf/DIGI-CCWMX53 Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/DIGI-CCWMX53 Fri Feb 13 15:27:46 2015 (r278676) @@ -128,10 +128,10 @@ device iic device iicbus # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. Modified: stable/10/sys/arm/conf/EB9200 ============================================================================== --- stable/10/sys/arm/conf/EB9200 Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/EB9200 Fri Feb 13 15:27:46 2015 (r278676) @@ -102,10 +102,10 @@ device ohci # OHCI localbus->USB inte device usb # USB Bus (required) device umass # Disks/Mass storage - Requires scbus and da # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB device (gadget) support #device at91_dci # Atmel's usb device Modified: stable/10/sys/arm/conf/EFIKA_MX ============================================================================== --- stable/10/sys/arm/conf/EFIKA_MX Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/EFIKA_MX Fri Feb 13 15:27:46 2015 (r278676) @@ -124,10 +124,10 @@ device iic device iicbus # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. Modified: stable/10/sys/arm/conf/EXYNOS5.common ============================================================================== --- stable/10/sys/arm/conf/EXYNOS5.common Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/EXYNOS5.common Fri Feb 13 15:27:46 2015 (r278676) @@ -103,7 +103,7 @@ device ehci #device ohci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass Modified: stable/10/sys/arm/conf/HL200 ============================================================================== --- stable/10/sys/arm/conf/HL200 Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/HL200 Fri Feb 13 15:27:46 2015 (r278676) @@ -132,10 +132,10 @@ device uath # Atheros AR5523 wireless device ural # Ralink Technology RT2500USB wireless NICs device zyd # ZyDAS zd1211/zd1211b wireless NICs # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # Wireless NIC cards device wlan # 802.11 support device wlan_wep # 802.11 WEP support Modified: stable/10/sys/arm/conf/HL201 ============================================================================== --- stable/10/sys/arm/conf/HL201 Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/HL201 Fri Feb 13 15:27:46 2015 (r278676) @@ -112,10 +112,10 @@ device udav # Davicom DM9601E USB #device ural # Ralink Technology RT2500USB wireless NICs #device zyd # ZyDAS zd1211/zd1211b wireless NICs # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # Wireless NIC cards #device wlan # 802.11 support #device wlan_wep # 802.11 WEP support Modified: stable/10/sys/arm/conf/IMX53-QSB ============================================================================== --- stable/10/sys/arm/conf/IMX53-QSB Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/IMX53-QSB Fri Feb 13 15:27:46 2015 (r278676) @@ -127,10 +127,10 @@ device iic device iicbus # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. Modified: stable/10/sys/arm/conf/IMX6 ============================================================================== --- stable/10/sys/arm/conf/IMX6 Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/IMX6 Fri Feb 13 15:27:46 2015 (r278676) @@ -93,10 +93,10 @@ device mmc # SD/MMC protocol device mmcsd # SDCard disk device # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support #options USB_DEBUG # enable debug msgs Modified: stable/10/sys/arm/conf/KB920X ============================================================================== --- stable/10/sys/arm/conf/KB920X Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/KB920X Fri Feb 13 15:27:46 2015 (r278676) @@ -132,10 +132,10 @@ device uath # Atheros AR5523 wireless device ural # Ralink Technology RT2500USB wireless NICs device zyd # ZyDAS zd1211/zd1211b wireless NICs # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # Wireless NIC cards device wlan # 802.11 support device wlan_wep # 802.11 WEP support Modified: stable/10/sys/arm/conf/NSLU ============================================================================== --- stable/10/sys/arm/conf/NSLU Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/NSLU Fri Feb 13 15:27:46 2015 (r278676) @@ -115,5 +115,5 @@ options USB_DEBUG device ohci device ehci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) Modified: stable/10/sys/arm/conf/PANDABOARD ============================================================================== --- stable/10/sys/arm/conf/PANDABOARD Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/PANDABOARD Fri Feb 13 15:27:46 2015 (r278676) @@ -12,54 +12,40 @@ # latest information. # # An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # # $FreeBSD$ ident PANDABOARD - - # This probably wants to move somewhere else. Maybe we can create a basic # OMAP4340 config, then make a PANDABOARD config that includes the basic one, # adds the start addresses and custom devices plus pulls in this hints file. -hints "PANDABOARD.hints" +hints "PANDABOARD.hints" -include "../ti/omap4/pandaboard/std.pandaboard" +include "../ti/omap4/pandaboard/std.pandaboard" #To statically compile in device wiring instead of /boot/device.hints makeoptions MODULES_OVERRIDE="" makeoptions WITHOUT_MODULES="ahc" -makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options HZ=100 - options SCHED_4BSD # 4BSD scheduler options INET # InterNETworking -#options INET6 # IPv6 communications protocols +options INET6 # IPv6 communications protocols 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 -device snp -options BREAK_TO_DEBUGGER - -options NFSCL -options NFS_ROOT # NFS usable as /, requires NFSCLIENT -#options BOOTP_NFSROOT -#options BOOTP_COMPAT -#options BOOTP -#options BOOTP_NFSV3 -#options BOOTP_WIRED_TO=ue0 options GEOM_PART_BSD # BSD partition scheme options GEOM_PART_MBR # MBR partition scheme options TMPFS # Efficient memory filesystem options MSDOSFS # MSDOS Filesystem -#options CD9660 # ISO 9660 Filesystem -#options PROCFS # Process filesystem (requires PSEUDOFS) +options CD9660 # ISO 9660 Filesystem +options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI @@ -69,9 +55,33 @@ options SYSVMSG # SYSV-style message options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev +options PREEMPTION options FREEBSD_BOOT_LOADER +options VFP # vfp/neon +options SMP # Enable multiple cores -options PREEMPTION +# Debugging for use in -current +makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +options BREAK_TO_DEBUGGER +#options VERBOSE_SYSINIT # Enable verbose sysinit messages +options KDB +options DDB # Enable the kernel debugger +#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 + +# NFS support +options NFSCL + +# NFS root +options NFS_ROOT # NFS usable as /, requires NFSCLIENT +#options BOOTP_NFSROOT +#options BOOTP_COMPAT +#options BOOTP +#options BOOTP_NFSV3 +#options BOOTP_WIRED_TO=ue0 # MMC/SD/SDIO Card slot support device mmc # mmc/sd bus @@ -83,56 +93,50 @@ device iicbus device iic device ti_i2c -device loop -device ether -device mii -device smc -device smcphy +# Console and misc device uart device uart_ns8250 - -device gpio - device pty - +device snp +device md +device random # Entropy device device pl310 # PL310 L2 cache controller -# Debugging for use in -current -#options VERBOSE_SYSINIT # Enable verbose sysinit messages -options KDB -options DDB # Enable the kernel debugger -#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 -device md +# GPIO +device gpio # The following enables MFS as root, this seems similar to an initramfs or initrd # as used in Linux. #options MD_ROOT #options MD_ROOT_SIZE=7560 -device random # Entropy device + # USB support -options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. device usb +options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. options USB_DEBUG #options USB_REQ_DEBUG #options USB_VERBOSE device ohci device ehci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) +# Ethernet +device loop +device ether +device mii +device smc +device smcphy +device bpf # USB Ethernet support, requires miibus device miibus #device axe # ASIX Electronics USB Ethernet device smsc # SMSC LAN95xx USB Ethernet -device bpf + # OMAP-specific devices device ti_sdma @@ -144,6 +148,3 @@ device twl_clks options FDT options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=pandaboard.dts - -options VFP # vfp/neon -options SMP # Enable multiple cores Modified: stable/10/sys/arm/conf/QILA9G20 ============================================================================== --- stable/10/sys/arm/conf/QILA9G20 Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/QILA9G20 Fri Feb 13 15:27:46 2015 (r278676) @@ -117,10 +117,10 @@ device iicbus device icee # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support device ohci # OHCI localbus->USB interface Modified: stable/10/sys/arm/conf/SAM9G20EK ============================================================================== --- stable/10/sys/arm/conf/SAM9G20EK Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/SAM9G20EK Fri Feb 13 15:27:46 2015 (r278676) @@ -119,10 +119,10 @@ device iicbus device icee # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support device ohci # OHCI localbus->USB interface Modified: stable/10/sys/arm/conf/SAM9X25EK ============================================================================== --- stable/10/sys/arm/conf/SAM9X25EK Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/SAM9X25EK Fri Feb 13 15:27:46 2015 (r278676) @@ -118,10 +118,10 @@ device iicbus device icee # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support #device ohci # OHCI localbus->USB interface Modified: stable/10/sys/arm/conf/SN9G45 ============================================================================== --- stable/10/sys/arm/conf/SN9G45 Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/SN9G45 Fri Feb 13 15:27:46 2015 (r278676) @@ -95,10 +95,10 @@ option AT91_ATE_USE_RMII device at91_wdt # WDT: Watchdog timer # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support device ohci # OHCI localbus->USB interface Modified: stable/10/sys/arm/conf/VYBRID ============================================================================== --- stable/10/sys/arm/conf/VYBRID Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/VYBRID Fri Feb 13 15:27:46 2015 (r278676) @@ -112,7 +112,7 @@ device ehci #device ohci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass Modified: stable/10/sys/arm/conf/ZEDBOARD ============================================================================== --- stable/10/sys/arm/conf/ZEDBOARD Fri Feb 13 15:16:55 2015 (r278675) +++ stable/10/sys/arm/conf/ZEDBOARD Fri Feb 13 15:27:46 2015 (r278676) @@ -92,7 +92,7 @@ options USB_DEBUG #options USB_VERBOSE device ehci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device axe # USB-Ethernet
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502131527.t1DFRlVs029644>