From owner-svn-src-head@freebsd.org Mon Dec 21 18:27:52 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A9AD2A4E29A; Mon, 21 Dec 2015 18:27:52 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5EC931AE5; Mon, 21 Dec 2015 18:27:52 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBLIRpTg053741; Mon, 21 Dec 2015 18:27:51 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBLIRpLf053739; Mon, 21 Dec 2015 18:27:51 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201512211827.tBLIRpLf053739@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 21 Dec 2015 18:27:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r292557 - head/sys/arm/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Dec 2015 18:27:52 -0000 Author: imp Date: Mon Dec 21 18:27:51 2015 New Revision: 292557 URL: https://svnweb.freebsd.org/changeset/base/292557 Log: Configure the Atmel eval boards to boot the same way. This gives them the same layout as other embedded systems. Modified: head/sys/arm/conf/SAM9260EK head/sys/arm/conf/SAM9G20EK Modified: head/sys/arm/conf/SAM9260EK ============================================================================== --- head/sys/arm/conf/SAM9260EK Mon Dec 21 18:19:14 2015 (r292556) +++ head/sys/arm/conf/SAM9260EK Mon Dec 21 18:27:51 2015 (r292557) @@ -103,8 +103,10 @@ options PRINTF_BUFR_SIZE=128 # Prevent #options BOOTP_NFSV3 #options BOOTP_WIRED_TO=macb0 -# alternatively, boot from a MMC/SD memory card -# s1 is FAT on this platform. +# s3 because s1 is reserved for the DOS parittions sometimes needed to +# boot off SD cards on the G20 and newer chips. s2 is reserved for +# nanobsd's config partition. s3 and s4 are for the ping-pong upgrade +# path. 9260 doesn't boot off SD, but let's keep things sane. options ROOTDEVNAME=\"ufs:/dev/mmcsd0s3a\" # Alternatively, boot from a USB card. Modified: head/sys/arm/conf/SAM9G20EK ============================================================================== --- head/sys/arm/conf/SAM9G20EK Mon Dec 21 18:19:14 2015 (r292556) +++ head/sys/arm/conf/SAM9G20EK Mon Dec 21 18:27:51 2015 (r292557) @@ -82,9 +82,11 @@ options DDB # Enable the kernel debug #options BOOTP_NFSV3 #options BOOTP_WIRED_TO=ate0 -# s2 because s1 is reserved for the DOS parittions sometimes needed to -# boot off SD cards on the G20 and newer chips. -options ROOTDEVNAME=\"ufs:/dev/mmcsd0s2a\" +# s3 because s1 is reserved for the DOS parittions sometimes needed to +# boot off SD cards on the G20 and newer chips. s2 is reserved for +# nanobsd's config partition. s3 and s4 are for the ping-pong upgrade +# path. +options ROOTDEVNAME=\"ufs:/dev/mmcsd0s3a\" # kernel/memory size reduction options MUTEX_NOINLINE