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

[Andrew Turner]

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