From owner-svn-src-all@FreeBSD.ORG  Mon Jul 15 07:01:31 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 4305D1DC;
 Mon, 15 Jul 2013 07:01:31 +0000 (UTC)
 (envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1AF90C73;
 Mon, 15 Jul 2013 07:01:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6F71UIB080963;
 Mon, 15 Jul 2013 07:01:31 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6F71URp080959;
 Mon, 15 Jul 2013 07:01:30 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201307150701.r6F71URp080959@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 15 Jul 2013 07:01:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253355 - 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.14
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: Mon, 15 Jul 2013 07:01:31 -0000

Author: rpaulo
Date: Mon Jul 15 07:01:30 2013
New Revision: 253355
URL: http://svnweb.freebsd.org/changeset/base/253355

Log:
  Move the Raspberry Pi low level options out of the kernel config and into
  std.rpi + std.bcm2835.
  
  Reviewed by:	imp

Added:
  head/sys/arm/broadcom/bcm2835/std.bcm2835   (contents, props changed)
  head/sys/arm/broadcom/bcm2835/std.rpi   (contents, props changed)
Modified:
  head/sys/arm/conf/RPI-B

Added: head/sys/arm/broadcom/bcm2835/std.bcm2835
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/arm/broadcom/bcm2835/std.bcm2835	Mon Jul 15 07:01:30 2013	(r253355)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+machine	arm armv6
+cpu	CPU_ARM1176
+
+files	"../broadcom/bcm2835/files.bcm2835"
+

Added: head/sys/arm/broadcom/bcm2835/std.rpi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/arm/broadcom/bcm2835/std.rpi	Mon Jul 15 07:01:30 2013	(r253355)
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+include		"../broadcom/bcm2835/std.bcm2835"
+
+options		KERNVIRTADDR=0xc0100000
+makeoptions	KERNVIRTADDR=0xc0100000
+options		KERNPHYSADDR=0x00100000
+makeoptions	KERNPHYSADDR=0x00100000
+options		PHYSADDR=0x00000000
+options		STARTUP_PAGETABLE_ADDR=0x01000000
+options		FREEBSD_BOOT_LOADER
+options		LINUX_BOOT_ABI

Modified: head/sys/arm/conf/RPI-B
==============================================================================
--- head/sys/arm/conf/RPI-B	Mon Jul 15 07:00:19 2013	(r253354)
+++ head/sys/arm/conf/RPI-B	Mon Jul 15 07:01:30 2013	(r253355)
@@ -18,21 +18,10 @@
 # $FreeBSD$
 
 ident		RPI-B
-machine		arm	armv6
-cpu 		CPU_ARM1176
 
-files		"../broadcom/bcm2835/files.bcm2835"
+include		"../broadcom/bcm2835/std.rpi"
 makeoptions	MODULES_OVERRIDE=""
 
-options 	KERNVIRTADDR=0xc0100000
-makeoptions	KERNVIRTADDR=0xc0100000
-options 	KERNPHYSADDR=0x00100000
-makeoptions	KERNPHYSADDR=0x00100000
-options 	PHYSADDR=0x00000000
-options 	STARTUP_PAGETABLE_ADDR=0x01000000
-options		FREEBSD_BOOT_LOADER
-options		LINUX_BOOT_ABI
-
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 options 	HZ=100