Index: head/sys/arm/conf/ARMADA38X
===================================================================
--- head/sys/arm/conf/ARMADA38X	(revision 294427)
+++ head/sys/arm/conf/ARMADA38X	(revision 294428)
@@ -1,63 +1,72 @@
 #
 # Kernel configuration for Marvell Armada38x
 #
 # $FreeBSD$
 #
 
 include 	"../mv/armada38x/std.armada38x"
 include 	"std.armv6"
 
 ident 	ARMADA38X
 
 options 	SOC_MV_ARMADA38X
 
 makeoptions 	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions 	WERROR="-Werror"
 
 options 	MD_ROOT
 #makeoptions 	MFS_IMAGE=/path/to/miniroot
-options 	ROOTDEVNAME=\"ufs:md0\"
+#options 	ROOTDEVNAME=\"ufs:md0\"
+options 	ROOTDEVNAME=\"/dev/da0s1a\"
 
 options 	SCHED_ULE		# ULE scheduler
 #options 	SCHED_4BSD		# 4BSD scheduler
 
 # Debugging
 #options 	DEBUG
 #options 	VERBOSE_SYSINIT
 options 	ALT_BREAK_TO_DEBUGGER
 options 	DDB
 #options 	GDB
 #options 	DIAGNOSTIC
 options 	INVARIANTS		# Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
 options 	KDB
 options 	KDB_TRACE
 #options 	WITNESS			# Enable checks to detect deadlocks and cycles
 #options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	WITNESS_KDB
 #options 	BOOTVERBOSE
 
 # Pseudo devices
 device		random
 device		pty
 device		loop
 device		md
 
 # Serial ports
 device		uart
 device		uart_ns8250
 
 # Network
 device		ether
 device		vlan
 
 # Interrupt controllers
 device		gic
 
 # Timers
 device		mpcore_timer
+
+# USB
+device		usb
+device		ehci
+device		umass
+device		scbus
+device		pass
+device		da
 
 #FDT
 options 	FDT
 options 	FDT_DTB_STATIC
 makeoptions 	FDT_DTS_FILE=armada-388-gp.dts