svn commit: r266086 - in stable/10/sys: arm/arm arm/conf arm/include boot/fdt/dts
Ian Lepore
ian at FreeBSD.org
Wed May 14 20:17:40 UTC 2014
Author: ian
Date: Wed May 14 20:17:31 2014
New Revision: 266086
URL: http://svnweb.freebsd.org/changeset/base/266086
Log:
MFC r260440, r260441, r260447, r260490, r260493
Add option USB_HOST_ALIGN to configs that contain 'device usb'.
Update dts files of Cubieboard1,2 to use 1GB memory.
Add a function to print the contents of the static device mapping table,
Modified:
stable/10/sys/arm/arm/devmap.c
stable/10/sys/arm/arm/machdep.c
stable/10/sys/arm/conf/AC100
stable/10/sys/arm/conf/ARMADAXP
stable/10/sys/arm/conf/ARNDALE
stable/10/sys/arm/conf/ATMEL
stable/10/sys/arm/conf/AVILA
stable/10/sys/arm/conf/BWCT
stable/10/sys/arm/conf/CAMBRIA
stable/10/sys/arm/conf/CNS11XXNAS
stable/10/sys/arm/conf/COSMIC
stable/10/sys/arm/conf/CUBIEBOARD
stable/10/sys/arm/conf/CUBIEBOARD2
stable/10/sys/arm/conf/DB-78XXX
stable/10/sys/arm/conf/DB-88F5XXX
stable/10/sys/arm/conf/DB-88F6XXX
stable/10/sys/arm/conf/DIGI-CCWMX53
stable/10/sys/arm/conf/EA3250
stable/10/sys/arm/conf/EB9200
stable/10/sys/arm/conf/EFIKA_MX
stable/10/sys/arm/conf/ETHERNUT5
stable/10/sys/arm/conf/HL200
stable/10/sys/arm/conf/HL201
stable/10/sys/arm/conf/IMX53-QSB
stable/10/sys/arm/conf/KB920X
stable/10/sys/arm/conf/LN2410SBC
stable/10/sys/arm/conf/NSLU
stable/10/sys/arm/conf/PANDABOARD
stable/10/sys/arm/conf/QILA9G20
stable/10/sys/arm/conf/RADXA
stable/10/sys/arm/conf/RPI-B
stable/10/sys/arm/conf/SAM9260EK
stable/10/sys/arm/conf/SAM9G20EK
stable/10/sys/arm/conf/SAM9X25EK
stable/10/sys/arm/conf/SHEEVAPLUG
stable/10/sys/arm/conf/SN9G45
stable/10/sys/arm/conf/TS7800
stable/10/sys/arm/conf/ZEDBOARD
stable/10/sys/arm/include/devmap.h
stable/10/sys/boot/fdt/dts/cubieboard.dts
stable/10/sys/boot/fdt/dts/cubieboard2.dts
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/arm/arm/devmap.c
==============================================================================
--- stable/10/sys/arm/arm/devmap.c Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/arm/devmap.c Wed May 14 20:17:31 2014 (r266086)
@@ -31,6 +31,8 @@ __FBSDID("$FreeBSD$");
* Routines for mapping device memory.
*/
+#include "opt_ddb.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <vm/vm.h>
@@ -54,6 +56,36 @@ static u_int akva_devmap_idx;
static vm_offset_t akva_devmap_vaddr = ARM_VECTORS_HIGH;
/*
+ * Print the contents of the static mapping table using the provided printf-like
+ * output function (which will be either printf or db_printf).
+ */
+static void
+devmap_dump_table(int (*prfunc)(const char *, ...))
+{
+ const struct arm_devmap_entry *pd;
+
+ if (devmap_table == NULL || devmap_table[0].pd_size == 0) {
+ prfunc("No static device mappings.\n");
+ return;
+ }
+
+ prfunc("Static device mappings:\n");
+ for (pd = devmap_table; pd->pd_size != 0; ++pd) {
+ prfunc(" 0x%08x - 0x%08x mapped at VA 0x%08x\n",
+ pd->pd_pa, pd->pd_pa + pd->pd_size - 1, pd->pd_va);
+ }
+}
+
+/*
+ * Print the contents of the static mapping table. Used for bootverbose.
+ */
+void
+arm_devmap_print_table()
+{
+ devmap_dump_table(printf);
+}
+
+/*
* Return the "last" kva address used by the registered devmap table. It's
* actually the lowest address used by the static mappings, i.e., the address of
* the first unusable byte of KVA.
@@ -266,3 +298,13 @@ pmap_unmapdev(vm_offset_t va, vm_size_t
kva_free(va, origsize);
}
+#ifdef DDB
+#include <ddb/ddb.h>
+
+DB_SHOW_COMMAND(devmap, db_show_devmap)
+{
+ devmap_dump_table(db_printf);
+}
+
+#endif /* DDB */
+
Modified: stable/10/sys/arm/arm/machdep.c
==============================================================================
--- stable/10/sys/arm/arm/machdep.c Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/arm/machdep.c Wed May 14 20:17:31 2014 (r266086)
@@ -379,10 +379,10 @@ cpu_startup(void *dummy)
vm_paddr_t size;
size = phys_avail[indx + 1] - phys_avail[indx];
- printf("%#08jx - %#08jx, %ju bytes (%ju pages)\n",
+ printf(" 0x%08jx - 0x%08jx, %ju KBytes (%ju pages)\n",
(uintmax_t)phys_avail[indx],
(uintmax_t)phys_avail[indx + 1] - 1,
- (uintmax_t)size, (uintmax_t)size / PAGE_SIZE);
+ (uintmax_t)size / 1024, (uintmax_t)size / PAGE_SIZE);
}
}
@@ -392,6 +392,9 @@ cpu_startup(void *dummy)
(uintmax_t)ptoa(cnt.v_free_count),
(uintmax_t)ptoa(cnt.v_free_count) / 1048576);
+ if (bootverbose)
+ arm_devmap_print_table();
+
bufinit();
vm_pager_bufferinit();
pcb->un_32.pcb32_und_sp = (u_int)thread0.td_kstack +
Modified: stable/10/sys/arm/conf/AC100
==============================================================================
--- stable/10/sys/arm/conf/AC100 Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/AC100 Wed May 14 20:17:31 2014 (r266086)
@@ -66,6 +66,7 @@ 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: stable/10/sys/arm/conf/ARMADAXP
==============================================================================
--- stable/10/sys/arm/conf/ARMADAXP Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/ARMADAXP Wed May 14 20:17:31 2014 (r266086)
@@ -67,6 +67,7 @@ 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: stable/10/sys/arm/conf/ARNDALE
==============================================================================
--- stable/10/sys/arm/conf/ARNDALE Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/ARNDALE Wed May 14 20:17:31 2014 (r266086)
@@ -94,6 +94,7 @@ 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: stable/10/sys/arm/conf/ATMEL
==============================================================================
--- stable/10/sys/arm/conf/ATMEL Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/ATMEL Wed May 14 20:17:31 2014 (r266086)
@@ -157,6 +157,7 @@ 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: stable/10/sys/arm/conf/AVILA
==============================================================================
--- stable/10/sys/arm/conf/AVILA Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/AVILA Wed May 14 20:17:31 2014 (r266086)
@@ -143,6 +143,7 @@ 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: stable/10/sys/arm/conf/BWCT
==============================================================================
--- stable/10/sys/arm/conf/BWCT Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/BWCT Wed May 14 20:17:31 2014 (r266086)
@@ -104,6 +104,7 @@ 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: stable/10/sys/arm/conf/CAMBRIA
==============================================================================
--- stable/10/sys/arm/conf/CAMBRIA Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/CAMBRIA Wed May 14 20:17:31 2014 (r266086)
@@ -136,6 +136,7 @@ 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: stable/10/sys/arm/conf/CNS11XXNAS
==============================================================================
--- stable/10/sys/arm/conf/CNS11XXNAS Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/CNS11XXNAS Wed May 14 20:17:31 2014 (r266086)
@@ -106,6 +106,7 @@ 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: stable/10/sys/arm/conf/COSMIC
==============================================================================
--- stable/10/sys/arm/conf/COSMIC Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/COSMIC Wed May 14 20:17:31 2014 (r266086)
@@ -97,6 +97,7 @@ device md
device gpio
# USB support
+options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
device usb
options USB_DEBUG
#options USB_REQ_DEBUG
Modified: stable/10/sys/arm/conf/CUBIEBOARD
==============================================================================
--- stable/10/sys/arm/conf/CUBIEBOARD Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/CUBIEBOARD Wed May 14 20:17:31 2014 (r266086)
@@ -106,6 +106,7 @@ 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: stable/10/sys/arm/conf/CUBIEBOARD2
==============================================================================
--- stable/10/sys/arm/conf/CUBIEBOARD2 Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/CUBIEBOARD2 Wed May 14 20:17:31 2014 (r266086)
@@ -106,6 +106,7 @@ 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: stable/10/sys/arm/conf/DB-78XXX
==============================================================================
--- stable/10/sys/arm/conf/DB-78XXX Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/DB-78XXX Wed May 14 20:17:31 2014 (r266086)
@@ -67,6 +67,7 @@ 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: stable/10/sys/arm/conf/DB-88F5XXX
==============================================================================
--- stable/10/sys/arm/conf/DB-88F5XXX Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/DB-88F5XXX Wed May 14 20:17:31 2014 (r266086)
@@ -73,6 +73,7 @@ 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: stable/10/sys/arm/conf/DB-88F6XXX
==============================================================================
--- stable/10/sys/arm/conf/DB-88F6XXX Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/DB-88F6XXX Wed May 14 20:17:31 2014 (r266086)
@@ -71,6 +71,7 @@ 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: stable/10/sys/arm/conf/DIGI-CCWMX53
==============================================================================
--- stable/10/sys/arm/conf/DIGI-CCWMX53 Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/DIGI-CCWMX53 Wed May 14 20:17:31 2014 (r266086)
@@ -134,6 +134,7 @@ 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: stable/10/sys/arm/conf/EA3250
==============================================================================
--- stable/10/sys/arm/conf/EA3250 Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/EA3250 Wed May 14 20:17:31 2014 (r266086)
@@ -65,6 +65,7 @@ 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: stable/10/sys/arm/conf/EB9200
==============================================================================
--- stable/10/sys/arm/conf/EB9200 Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/EB9200 Wed May 14 20:17:31 2014 (r266086)
@@ -92,6 +92,7 @@ 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: stable/10/sys/arm/conf/EFIKA_MX
==============================================================================
--- stable/10/sys/arm/conf/EFIKA_MX Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/EFIKA_MX Wed May 14 20:17:31 2014 (r266086)
@@ -130,6 +130,7 @@ 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: stable/10/sys/arm/conf/ETHERNUT5
==============================================================================
--- stable/10/sys/arm/conf/ETHERNUT5 Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/ETHERNUT5 Wed May 14 20:17:31 2014 (r266086)
@@ -149,6 +149,7 @@ 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: stable/10/sys/arm/conf/HL200
==============================================================================
--- stable/10/sys/arm/conf/HL200 Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/HL200 Wed May 14 20:17:31 2014 (r266086)
@@ -94,6 +94,7 @@ 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: stable/10/sys/arm/conf/HL201
==============================================================================
--- stable/10/sys/arm/conf/HL201 Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/HL201 Wed May 14 20:17:31 2014 (r266086)
@@ -96,6 +96,7 @@ device icee
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: stable/10/sys/arm/conf/IMX53-QSB
==============================================================================
--- stable/10/sys/arm/conf/IMX53-QSB Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/IMX53-QSB Wed May 14 20:17:31 2014 (r266086)
@@ -133,6 +133,7 @@ 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: stable/10/sys/arm/conf/KB920X
==============================================================================
--- stable/10/sys/arm/conf/KB920X Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/KB920X Wed May 14 20:17:31 2014 (r266086)
@@ -95,6 +95,7 @@ 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: stable/10/sys/arm/conf/LN2410SBC
==============================================================================
--- stable/10/sys/arm/conf/LN2410SBC Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/LN2410SBC Wed May 14 20:17:31 2014 (r266086)
@@ -77,6 +77,7 @@ 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: stable/10/sys/arm/conf/NSLU
==============================================================================
--- stable/10/sys/arm/conf/NSLU Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/NSLU Wed May 14 20:17:31 2014 (r266086)
@@ -109,6 +109,7 @@ 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: stable/10/sys/arm/conf/PANDABOARD
==============================================================================
--- stable/10/sys/arm/conf/PANDABOARD Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/PANDABOARD Wed May 14 20:17:31 2014 (r266086)
@@ -112,6 +112,7 @@ 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: stable/10/sys/arm/conf/QILA9G20
==============================================================================
--- stable/10/sys/arm/conf/QILA9G20 Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/QILA9G20 Wed May 14 20:17:31 2014 (r266086)
@@ -119,6 +119,7 @@ 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: stable/10/sys/arm/conf/RADXA
==============================================================================
--- stable/10/sys/arm/conf/RADXA Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/RADXA Wed May 14 20:17:31 2014 (r266086)
@@ -93,6 +93,7 @@ device da # Direct Access (disks)
device pass
# USB support
+options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
device usb
options USB_DEBUG
#options USB_REQ_DEBUG
Modified: stable/10/sys/arm/conf/RPI-B
==============================================================================
--- stable/10/sys/arm/conf/RPI-B Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/RPI-B Wed May 14 20:17:31 2014 (r266086)
@@ -93,6 +93,7 @@ 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: stable/10/sys/arm/conf/SAM9260EK
==============================================================================
--- stable/10/sys/arm/conf/SAM9260EK Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/SAM9260EK Wed May 14 20:17:31 2014 (r266086)
@@ -157,6 +157,7 @@ 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: stable/10/sys/arm/conf/SAM9G20EK
==============================================================================
--- stable/10/sys/arm/conf/SAM9G20EK Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/SAM9G20EK Wed May 14 20:17:31 2014 (r266086)
@@ -119,6 +119,7 @@ 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: stable/10/sys/arm/conf/SAM9X25EK
==============================================================================
--- stable/10/sys/arm/conf/SAM9X25EK Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/SAM9X25EK Wed May 14 20:17:31 2014 (r266086)
@@ -121,6 +121,7 @@ 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: stable/10/sys/arm/conf/SHEEVAPLUG
==============================================================================
--- stable/10/sys/arm/conf/SHEEVAPLUG Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/SHEEVAPLUG Wed May 14 20:17:31 2014 (r266086)
@@ -65,6 +65,7 @@ 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: stable/10/sys/arm/conf/SN9G45
==============================================================================
--- stable/10/sys/arm/conf/SN9G45 Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/SN9G45 Wed May 14 20:17:31 2014 (r266086)
@@ -97,6 +97,7 @@ 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: stable/10/sys/arm/conf/TS7800
==============================================================================
--- stable/10/sys/arm/conf/TS7800 Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/TS7800 Wed May 14 20:17:31 2014 (r266086)
@@ -61,6 +61,7 @@ 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: stable/10/sys/arm/conf/ZEDBOARD
==============================================================================
--- stable/10/sys/arm/conf/ZEDBOARD Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/conf/ZEDBOARD Wed May 14 20:17:31 2014 (r266086)
@@ -81,6 +81,7 @@ 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
Modified: stable/10/sys/arm/include/devmap.h
==============================================================================
--- stable/10/sys/arm/include/devmap.h Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/arm/include/devmap.h Wed May 14 20:17:31 2014 (r266086)
@@ -87,4 +87,7 @@ void arm_devmap_bootstrap(vm_offset_t _l
void * arm_devmap_ptov(vm_paddr_t _pa, vm_size_t _sz);
vm_paddr_t arm_devmap_vtop(void * _va, vm_size_t _sz);
+/* Print the static mapping table; used for bootverbose output. */
+void arm_devmap_print_table(void);
+
#endif
Modified: stable/10/sys/boot/fdt/dts/cubieboard.dts
==============================================================================
--- stable/10/sys/boot/fdt/dts/cubieboard.dts Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/boot/fdt/dts/cubieboard.dts Wed May 14 20:17:31 2014 (r266086)
@@ -38,7 +38,7 @@
memory {
device_type = "memory";
- reg = < 0x40000000 0x20000000 >; /* 512MB RAM */
+ reg = < 0x40000000 0x40000000 >; /* 1GB RAM */
};
aliases {
Modified: stable/10/sys/boot/fdt/dts/cubieboard2.dts
==============================================================================
--- stable/10/sys/boot/fdt/dts/cubieboard2.dts Wed May 14 20:11:20 2014 (r266085)
+++ stable/10/sys/boot/fdt/dts/cubieboard2.dts Wed May 14 20:17:31 2014 (r266086)
@@ -38,7 +38,7 @@
memory {
device_type = "memory";
- reg = < 0x40000000 0x20000000 >; /* 512MB RAM */
+ reg = < 0x40000000 0x40000000 >; /* 1GB RAM */
};
aliases {
@@ -61,7 +61,7 @@
#interrupt-cells = <1>;
};
- cpu-cfg at 01c20000 {
+ cpu-cfg at 01c25c00 {
compatible = "allwinner,sun7i-cpu-cfg";
#address-cells = <1>;
#size-cells = <1>;
More information about the svn-src-all
mailing list