Date: Fri, 7 Feb 2014 03:30:16 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r261570 - head/sys/arm/conf Message-ID: <201402070330.s173UGtw087097@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Fri Feb 7 03:30:16 2014 New Revision: 261570 URL: http://svnweb.freebsd.org/changeset/base/261570 Log: Revert r260440. I didn't realize that most of this change was already in effect due to r250753. That is sufficient for all SoCs with a 32 byte cache line size. Systems with 64 byte cache lines will need the option; that will be done in a separate commit. Thanks to loos@ for pointing out r250753. Modified: head/sys/arm/conf/AC100 head/sys/arm/conf/ARMADAXP head/sys/arm/conf/ARNDALE head/sys/arm/conf/ATMEL head/sys/arm/conf/AVILA head/sys/arm/conf/BWCT head/sys/arm/conf/CAMBRIA head/sys/arm/conf/CNS11XXNAS head/sys/arm/conf/CUBIEBOARD head/sys/arm/conf/CUBIEBOARD2 head/sys/arm/conf/DB-78XXX head/sys/arm/conf/DB-88F5XXX head/sys/arm/conf/DB-88F6XXX head/sys/arm/conf/DIGI-CCWMX53 head/sys/arm/conf/EA3250 head/sys/arm/conf/EB9200 head/sys/arm/conf/EFIKA_MX head/sys/arm/conf/ETHERNUT5 head/sys/arm/conf/HL200 head/sys/arm/conf/HL201 head/sys/arm/conf/IMX53-QSB head/sys/arm/conf/KB920X head/sys/arm/conf/LN2410SBC head/sys/arm/conf/NSLU head/sys/arm/conf/PANDABOARD head/sys/arm/conf/QILA9G20 head/sys/arm/conf/RPI-B head/sys/arm/conf/SAM9260EK head/sys/arm/conf/SAM9G20EK head/sys/arm/conf/SAM9X25EK head/sys/arm/conf/SHEEVAPLUG head/sys/arm/conf/SN9G45 head/sys/arm/conf/TS7800 head/sys/arm/conf/ZEDBOARD Modified: head/sys/arm/conf/AC100 ============================================================================== --- head/sys/arm/conf/AC100 Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/AC100 Fri Feb 7 03:30:16 2014 (r261570) @@ -66,7 +66,6 @@ device loop device md # USB -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #options USB_DEBUG # enable debug msgs #device usb #device ehci Modified: head/sys/arm/conf/ARMADAXP ============================================================================== --- head/sys/arm/conf/ARMADAXP Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/ARMADAXP Fri Feb 7 03:30:16 2014 (r261570) @@ -67,7 +67,6 @@ device loop device md # USB -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device usb device ehci Modified: head/sys/arm/conf/ARNDALE ============================================================================== --- head/sys/arm/conf/ARNDALE Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/ARNDALE Fri Feb 7 03:30:16 2014 (r261570) @@ -94,7 +94,6 @@ device md device gpio # USB support -options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. device usb options USB_DEBUG #options USB_REQ_DEBUG Modified: head/sys/arm/conf/ATMEL ============================================================================== --- head/sys/arm/conf/ATMEL Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/ATMEL Fri Feb 7 03:30:16 2014 (r261570) @@ -156,7 +156,6 @@ device uart # Multi-uart driver options ALT_BREAK_TO_DEBUGGER # USB support -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device ohci # OHCI USB interface device usb # USB Bus (required) Modified: head/sys/arm/conf/AVILA ============================================================================== --- head/sys/arm/conf/AVILA Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/AVILA Fri Feb 7 03:30:16 2014 (r261570) @@ -143,7 +143,6 @@ device ath_ar9160 device ath_ar9280 device usb -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #options USB_DEBUG device ohci device ehci Modified: head/sys/arm/conf/BWCT ============================================================================== --- head/sys/arm/conf/BWCT Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/BWCT Fri Feb 7 03:30:16 2014 (r261570) @@ -104,7 +104,6 @@ device spibus device bpf # Berkeley packet filter #options USB_DEBUG -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #device ohci #device usb #device umass # Disks/Mass storage - Requires scbus and da Modified: head/sys/arm/conf/CAMBRIA ============================================================================== --- head/sys/arm/conf/CAMBRIA Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/CAMBRIA Fri Feb 7 03:30:16 2014 (r261570) @@ -136,7 +136,6 @@ options AH_SUPPORT_AR5416 # NB: for 11n device ath_hal # NB: 2 USB 2.0 ports standard -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. device usb options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order #options USB_DEBUG Modified: head/sys/arm/conf/CNS11XXNAS ============================================================================== --- head/sys/arm/conf/CNS11XXNAS Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/CNS11XXNAS Fri Feb 7 03:30:16 2014 (r261570) @@ -105,7 +105,6 @@ device random # Entrop #options ARM_USE_SMALL_ALLOC device usb -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #options USB_DEBUG device ohci device ehci Modified: head/sys/arm/conf/CUBIEBOARD ============================================================================== --- head/sys/arm/conf/CUBIEBOARD Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/CUBIEBOARD Fri Feb 7 03:30:16 2014 (r261570) @@ -106,7 +106,6 @@ device da # Direct Access (disks) device pass # USB support -options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. device usb options USB_DEBUG #options USB_REQ_DEBUG Modified: head/sys/arm/conf/CUBIEBOARD2 ============================================================================== --- head/sys/arm/conf/CUBIEBOARD2 Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/CUBIEBOARD2 Fri Feb 7 03:30:16 2014 (r261570) @@ -106,7 +106,6 @@ device da # Direct Access (disks) device pass # USB support -options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. device usb options USB_DEBUG #options USB_REQ_DEBUG Modified: head/sys/arm/conf/DB-78XXX ============================================================================== --- head/sys/arm/conf/DB-78XXX Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/DB-78XXX Fri Feb 7 03:30:16 2014 (r261570) @@ -67,7 +67,6 @@ device e1000phy device bpf # USB -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device usb device ehci Modified: head/sys/arm/conf/DB-88F5XXX ============================================================================== --- head/sys/arm/conf/DB-88F5XXX Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/DB-88F5XXX Fri Feb 7 03:30:16 2014 (r261570) @@ -73,7 +73,6 @@ device iicbus device ds133x # USB -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device usb device ehci Modified: head/sys/arm/conf/DB-88F6XXX ============================================================================== --- head/sys/arm/conf/DB-88F6XXX Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/DB-88F6XXX Fri Feb 7 03:30:16 2014 (r261570) @@ -71,7 +71,6 @@ device crypto device cryptodev # USB -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device usb device ehci Modified: head/sys/arm/conf/DIGI-CCWMX53 ============================================================================== --- head/sys/arm/conf/DIGI-CCWMX53 Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/DIGI-CCWMX53 Fri Feb 7 03:30:16 2014 (r261570) @@ -134,7 +134,6 @@ device cd # CD device pass # Passthrough device (direct SCSI access) # USB support -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device ehci # OHCI USB interface device usb # USB Bus (required) Modified: head/sys/arm/conf/EA3250 ============================================================================== --- head/sys/arm/conf/EA3250 Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/EA3250 Fri Feb 7 03:30:16 2014 (r261570) @@ -65,7 +65,6 @@ device bpf device lpe # USB -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG device usb device ohci Modified: head/sys/arm/conf/EB9200 ============================================================================== --- head/sys/arm/conf/EB9200 Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/EB9200 Fri Feb 7 03:30:16 2014 (r261570) @@ -92,7 +92,6 @@ device icee device bpf # USB support -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device ohci # OHCI localbus->USB interface device usb # USB Bus (required) Modified: head/sys/arm/conf/EFIKA_MX ============================================================================== --- head/sys/arm/conf/EFIKA_MX Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/EFIKA_MX Fri Feb 7 03:30:16 2014 (r261570) @@ -130,7 +130,6 @@ device cd # CD device pass # Passthrough device (direct SCSI access) # USB support -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #options USB_DEBUG # enable debug msgs device ehci # OHCI USB interface device usb # USB Bus (required) Modified: head/sys/arm/conf/ETHERNUT5 ============================================================================== --- head/sys/arm/conf/ETHERNUT5 Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/ETHERNUT5 Fri Feb 7 03:30:16 2014 (r261570) @@ -149,7 +149,6 @@ device uart # Multi-uart driver options ALT_BREAK_TO_DEBUGGER # USB support -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #options USB_DEBUG # enable debug msgs device ohci # OHCI USB interface device usb # USB Bus (required) Modified: head/sys/arm/conf/HL200 ============================================================================== --- head/sys/arm/conf/HL200 Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/HL200 Fri Feb 7 03:30:16 2014 (r261570) @@ -94,7 +94,6 @@ device icee device bpf # USB support -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device ohci # OHCI localbus->USB interface device usb # USB Bus (required) Modified: head/sys/arm/conf/HL201 ============================================================================== --- head/sys/arm/conf/HL201 Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/HL201 Fri Feb 7 03:30:16 2014 (r261570) @@ -85,7 +85,6 @@ device md device bpf # USB support -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. device ohci # OHCI localbus->USB interface device usb # USB Bus (required) #device udbp # USB Double Bulk Pipe devices Modified: head/sys/arm/conf/IMX53-QSB ============================================================================== --- head/sys/arm/conf/IMX53-QSB Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/IMX53-QSB Fri Feb 7 03:30:16 2014 (r261570) @@ -133,7 +133,6 @@ device cd # CD device pass # Passthrough device (direct SCSI access) # USB support -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #options USB_DEBUG # enable debug msgs device ehci # OHCI USB interface device usb # USB Bus (required) Modified: head/sys/arm/conf/KB920X ============================================================================== --- head/sys/arm/conf/KB920X Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/KB920X Fri Feb 7 03:30:16 2014 (r261570) @@ -95,7 +95,6 @@ device icee device bpf # USB support -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device ohci # OHCI localbus->USB interface device usb # USB Bus (required) Modified: head/sys/arm/conf/LN2410SBC ============================================================================== --- head/sys/arm/conf/LN2410SBC Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/LN2410SBC Fri Feb 7 03:30:16 2014 (r261570) @@ -77,7 +77,6 @@ options WITNESS_SKIPSPIN #Don't run wit device md -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device usb device ohci Modified: head/sys/arm/conf/NSLU ============================================================================== --- head/sys/arm/conf/NSLU Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/NSLU Fri Feb 7 03:30:16 2014 (r261570) @@ -108,7 +108,6 @@ device random # Entropy device #options ARM_USE_SMALL_ALLOC device usb -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG device ohci device ehci Modified: head/sys/arm/conf/PANDABOARD ============================================================================== --- head/sys/arm/conf/PANDABOARD Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/PANDABOARD Fri Feb 7 03:30:16 2014 (r261570) @@ -112,7 +112,6 @@ device md device random # Entropy device # USB support -options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. device usb options USB_DEBUG #options USB_REQ_DEBUG Modified: head/sys/arm/conf/QILA9G20 ============================================================================== --- head/sys/arm/conf/QILA9G20 Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/QILA9G20 Fri Feb 7 03:30:16 2014 (r261570) @@ -118,7 +118,6 @@ device cd # CD device pass # Passthrough device (direct SCSI access) # USB support -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. device ohci # OHCI localbus->USB interface device usb # USB Bus (required) device umass # Disks/Mass storage - Requires scbus and da Modified: head/sys/arm/conf/RPI-B ============================================================================== --- head/sys/arm/conf/RPI-B Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/RPI-B Fri Feb 7 03:30:16 2014 (r261570) @@ -93,7 +93,6 @@ device md device random # Entropy device # USB support -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. device usb options USB_DEBUG device dwcotg #DWC OTG controller Modified: head/sys/arm/conf/SAM9260EK ============================================================================== --- head/sys/arm/conf/SAM9260EK Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/SAM9260EK Fri Feb 7 03:30:16 2014 (r261570) @@ -158,7 +158,6 @@ device uart # Multi-uart driver options ALT_BREAK_TO_DEBUGGER # USB support -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #options USB_DEBUG # enable debug msgs device ohci # OHCI USB interface device usb # USB Bus (required) Modified: head/sys/arm/conf/SAM9G20EK ============================================================================== --- head/sys/arm/conf/SAM9G20EK Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/SAM9G20EK Fri Feb 7 03:30:16 2014 (r261570) @@ -122,7 +122,6 @@ device cd # CD device pass # Passthrough device (direct SCSI access) # USB support -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. device ohci # OHCI localbus->USB interface device usb # USB Bus (required) device umass # Disks/Mass storage - Requires scbus and da Modified: head/sys/arm/conf/SAM9X25EK ============================================================================== --- head/sys/arm/conf/SAM9X25EK Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/SAM9X25EK Fri Feb 7 03:30:16 2014 (r261570) @@ -120,7 +120,6 @@ device cd # CD device pass # Passthrough device (direct SCSI access) # USB support -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #device ohci # OHCI localbus->USB interface #device usb # USB Bus (required) #device umass # Disks/Mass storage - Requires scbus and da Modified: head/sys/arm/conf/SHEEVAPLUG ============================================================================== --- head/sys/arm/conf/SHEEVAPLUG Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/SHEEVAPLUG Fri Feb 7 03:30:16 2014 (r261570) @@ -65,7 +65,6 @@ device crypto device cryptodev # USB -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device usb device ehci Modified: head/sys/arm/conf/SN9G45 ============================================================================== --- head/sys/arm/conf/SN9G45 Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/SN9G45 Fri Feb 7 03:30:16 2014 (r261570) @@ -96,7 +96,6 @@ device cd # CD device pass # Passthrough device (direct SCSI access) # USB support -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. device ohci # OHCI localbus->USB interface device usb # USB Bus (required) device umass # Disks/Mass storage - Requires scbus and da Modified: head/sys/arm/conf/TS7800 ============================================================================== --- head/sys/arm/conf/TS7800 Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/TS7800 Fri Feb 7 03:30:16 2014 (r261570) @@ -61,7 +61,6 @@ device bpf options HZ=1000 # USB -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. device usb device ehci device umass Modified: head/sys/arm/conf/ZEDBOARD ============================================================================== --- head/sys/arm/conf/ZEDBOARD Thu Feb 6 22:10:26 2014 (r261569) +++ head/sys/arm/conf/ZEDBOARD Fri Feb 7 03:30:16 2014 (r261570) @@ -81,7 +81,6 @@ device sdhci # generic sdhci device bpf # Berkeley packet filter # USB support -options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. device usb options USB_DEBUG #options USB_REQ_DEBUG
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402070330.s173UGtw087097>