From owner-svn-src-all@FreeBSD.ORG  Tue Mar 24 19:01:44 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 11DC8E62;
 Tue, 24 Mar 2015 19:01:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 F0C72853;
 Tue, 24 Mar 2015 19:01:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2OJ1huj037449;
 Tue, 24 Mar 2015 19:01:43 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2OJ1hYc037445;
 Tue, 24 Mar 2015 19:01:43 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201503241901.t2OJ1hYc037445@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Tue, 24 Mar 2015 19:01:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280453 - in head/sys/arm: broadcom/bcm2835 conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Mar 2015 19:01:44 -0000

Author: andrew
Date: Tue Mar 24 19:01:42 2015
New Revision: 280453
URL: https://svnweb.freebsd.org/changeset/base/280453

Log:
  Move including std.bcm2835 to the RPI-B kernel config. The std.rpi file
  will be shared between the existing Raspberry Pi config, and the new
  Raspberry Pi 2 config.
  
  MFC after:	1 week

Modified:
  head/sys/arm/broadcom/bcm2835/std.rpi
  head/sys/arm/conf/RPI-B

Modified: head/sys/arm/broadcom/bcm2835/std.rpi
==============================================================================
--- head/sys/arm/broadcom/bcm2835/std.rpi	Tue Mar 24 18:46:01 2015	(r280452)
+++ head/sys/arm/broadcom/bcm2835/std.rpi	Tue Mar 24 19:01:42 2015	(r280453)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-include		"../broadcom/bcm2835/std.bcm2835"
-
 options		KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000
 options		KERNPHYSADDR=0x00100000

Modified: head/sys/arm/conf/RPI-B
==============================================================================
--- head/sys/arm/conf/RPI-B	Tue Mar 24 18:46:01 2015	(r280452)
+++ head/sys/arm/conf/RPI-B	Tue Mar 24 19:01:42 2015	(r280453)
@@ -21,6 +21,7 @@
 ident		RPI-B
 
 include		"../broadcom/bcm2835/std.rpi"
+include		"../broadcom/bcm2835/std.bcm2835"
 
 options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler