svn commit: r253355 - in head/sys/arm: broadcom/bcm2835 conf

[Rui Paulo]

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