# HG changeset patch # Parent 0bd4a619a09b09bb7b23644410125441a58039b2 diff -r 0bd4a619a09b -r 8c23a8e8fcfa sys/arm/at91/files.at91 --- a/sys/arm/at91/files.at91 +++ b/sys/arm/at91/files.at91 @@ -61,6 +61,6 @@ arm/at91/board_tsc4370.c optional at91_b # dev/usb/controller/at91dci.c optional at91_dci dev/usb/controller/at91dci_atmelarm.c optional at91_dci !fdt -dev/usb/controller/ohci_atmelarm.c optional ohci !fdt +dev/usb/controller/ohci_atmelarm.c optional ohci dev/usb/controller/at91dci_fdt.c optional at91_dci fdt dev/usb/controller/ohci_fdt.c optional ohci fdt diff -r 0bd4a619a09b -r 8c23a8e8fcfa sys/arm/conf/SAM9G20EK --- a/sys/arm/conf/SAM9G20EK +++ b/sys/arm/conf/SAM9G20EK @@ -52,7 +52,8 @@ options NFSCL # New Network Filesyste #options BOOTP_WIRED_TO=ate0 #options BOOTP_COMPAT -options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" +#options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" +options ROOTDEVNAME=\"ufs:/dev/da0s1a\" options ALT_BREAK_TO_DEBUGGER diff -r 0bd4a619a09b -r 8c23a8e8fcfa sys/dev/usb/controller/ohci_atmelarm.c --- a/sys/dev/usb/controller/ohci_atmelarm.c +++ b/sys/dev/usb/controller/ohci_atmelarm.c @@ -78,6 +78,7 @@ static int ohci_atmelarm_probe(device_t dev) { + device_printf(dev, "AT91 integrated OHCI controller"); device_set_desc(dev, "AT91 integrated OHCI controller"); return (BUS_PROBE_DEFAULT); }