From owner-svn-src-all@FreeBSD.ORG Fri Jul 27 05:37:02 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D8231065688; Fri, 27 Jul 2012 05:37:02 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0900C8FC0A; Fri, 27 Jul 2012 05:37:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6R5b1bx069245; Fri, 27 Jul 2012 05:37:01 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6R5b1CB069243; Fri, 27 Jul 2012 05:37:01 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201207270537.q6R5b1CB069243@svn.freebsd.org> From: Warner Losh Date: Fri, 27 Jul 2012 05:37:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r238823 - head/sys/arm/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jul 2012 05:37:02 -0000 Author: imp Date: Fri Jul 27 05:37:01 2012 New Revision: 238823 URL: http://svn.freebsd.org/changeset/base/238823 Log: Document the dataflash/mmc-sd issue. Add umass driver and usb. Boot off da0s1a instead of ate0. Note that MMC/SD is slot B. Until I switch over to NAND boot, dataflash booting will preclude having SD cards inserted at boot, so this last bit is untested. My SAM9260-EK not boots to multi-user prompt. Modified: head/sys/arm/conf/SAM9260EK Modified: head/sys/arm/conf/SAM9260EK ============================================================================== --- head/sys/arm/conf/SAM9260EK Fri Jul 27 05:34:45 2012 (r238822) +++ head/sys/arm/conf/SAM9260EK Fri Jul 27 05:37:01 2012 (r238823) @@ -66,14 +66,17 @@ options PRINTF_BUFR_SIZE=128 # Prevent #options INCLUDE_CONFIG_FILE # Include this file in kernel # required for netbooting -options BOOTP -options BOOTP_COMPAT -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=ate0 +#options BOOTP +#options BOOTP_COMPAT +#options BOOTP_NFSROOT +#options BOOTP_NFSV3 +#options BOOTP_WIRED_TO=ate0 # alternatively, boot from a MMC/SD memory card -#options ROOTDEVNAME=\"ufs:/dev/mmcsd0a\" +#options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" + +# Alternatively, boot from a USB card. +options ROOTDEVNAME=\"ufs:/dev/da0s1a\" # kernel/memory size reduction options MUTEX_NOINLINE @@ -112,16 +115,21 @@ device iicbus # I2C bus system device icee # I2C eeprom # MMC/SD +# See comment for DataFlash below device at91_mci # Atmel AT91 Multimedia Card Interface -options AT91_MCI_HAS_4WIRE +options AT91_MCI_HAS_4WIRE # 4 wires +options AT91_MCI_SLOT_B # Wired to slot B device mmc # MMC/SD bus device mmcsd # MMC/SD memory card # DataFlash -device at91_spi # Atmel AT91 Serial Peripheral Interface -device spibus # SPI bus -device at45d # Atmel AT45D -device geom_map # GEOM partition mapping +# The DataFlash and MMC card are wired together, so we must pick one or the +# other. This is due to pin mux, and also due to the design of the +# SAM9260EK board. SLOT A wouldn't have this issue. +#device at91_spi # Atmel AT91 Serial Peripheral Interface +#device spibus # SPI bus +#device at45d # Atmel AT45D +#device geom_map # GEOM partition mapping # Pseudo devices. device loop # Network loopback @@ -135,13 +143,13 @@ device ether # Ethernet support #device firmware # firmware assist module # SCSI peripherals -#device scbus # SCSI bus (required for ATA/SCSI) +device scbus # SCSI bus (required for ATA/SCSI) #device ch # SCSI media changers -#device da # Direct Access (disks) +device da # Direct Access (disks) #device sa # Sequential Access (tape etc) -#device cd # CD -#device pass # Passthrough device (direct ATA/SCSI access) -#device ses # Enclosure Services (SES and SAF-TE) +device cd # CD/DVD +device pass # Passthrough device (direct ATA/SCSI access) +device ses # Enclosure Services (SES and SAF-TE) #device ctl # CAM Target Layer # Serial (COM) ports @@ -150,9 +158,9 @@ options ALT_BREAK_TO_DEBUGGER # USB support #options USB_DEBUG # enable debug msgs -device ohci # OHCI PCI->USB interface +device ohci # OHCI USB interface device usb # USB Bus (required) -#device umass # Disks/Mass storage - Requires scbus and da +device umass # Disks/Mass storage - Requires scbus and da # watchdog device at91_wdt # Atmel AT91 Watchdog Timer