From owner-svn-soc-all@FreeBSD.ORG Fri Aug 10 14:53:36 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 654D2106566B for ; Fri, 10 Aug 2012 14:53:34 +0000 (UTC) (envelope-from aleek@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Fri, 10 Aug 2012 14:53:34 +0000 Date: Fri, 10 Aug 2012 14:53:34 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120810145334.654D2106566B@hub.freebsd.org> Cc: Subject: socsvn commit: r240242 - in soc2012/aleek/beaglexm-armv6/sys/arm: conf ti/usb X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Aug 2012 14:53:36 -0000 Author: aleek Date: Fri Aug 10 14:53:33 2012 New Revision: 240242 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240242 Log: reverted ehci changes. It is still not working Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Fri Aug 10 13:36:33 2012 (r240241) +++ soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Fri Aug 10 14:53:33 2012 (r240242) @@ -82,7 +82,7 @@ device mmcsd # mmc/sd flash cards # Boot device is 2nd slice on MMC/SD card -options ROOTDEVNAME=\"msdosfs:mmcsd0s2\" +options ROOTDEVNAME=\"msdosfs:mmcsd0s3\" # Console and misc @@ -109,21 +109,21 @@ options USB_DEBUG options USB_REQ_DEBUG options USB_VERBOSE -device musb +#device musb device ehci device umass device scbus # SCSI bus (required for SCSI) -device da # Direct Access (disks) +#device da # Direct Access (disks) # Ethernet device loop -device ether -device mii -device smcphy +#device ether +#device mii +#device smcphy # USB ethernet support, requires miibus -device miibus -device smsc +#device miibus +#device smsc # Flattened Device Tree options FDT Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c Fri Aug 10 13:36:33 2012 (r240241) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/usb/omap_ehci.c Fri Aug 10 14:53:33 2012 (r240242) @@ -920,7 +920,7 @@ /* Finally we are ready to kick off the ECHI host controller */ - err = 0; //ehci_init(sc); + err = ehci_init(sc); if (err == 0) { err = device_probe_and_attach(sc->sc_bus.bdev); }