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

[Andrew Turner]

Author: andrew
Date: Tue Mar 24 18:46:01 2015
New Revision: 280452
URL: https://svnweb.freebsd.org/changeset/base/280452

Log:
  Add the SOC_BCM2835 and SOC_BCM2836 options for the arm kernel and add the
  former to std.bcm2835. These will be used to enable support for the
  Raspberry Pi 2.
  
  MFC after:	1 week

Modified:
  head/sys/arm/broadcom/bcm2835/std.bcm2835
  head/sys/conf/options.arm

Modified: head/sys/arm/broadcom/bcm2835/std.bcm2835
==============================================================================
--- head/sys/arm/broadcom/bcm2835/std.bcm2835	Tue Mar 24 18:09:07 2015	(r280451)
+++ head/sys/arm/broadcom/bcm2835/std.bcm2835	Tue Mar 24 18:46:01 2015	(r280452)
@@ -3,6 +3,7 @@
 machine	arm armv6
 cpu	CPU_ARM1176
 makeoptions	CONF_CFLAGS="-mcpu=arm1176jzf-s"
+options 	SOC_BCM2835
 
 files	"../broadcom/bcm2835/files.bcm2835"
 files	"../broadcom/bcm2835/files.bcm283x"

Modified: head/sys/conf/options.arm
==============================================================================
--- head/sys/conf/options.arm	Tue Mar 24 18:09:07 2015	(r280451)
+++ head/sys/conf/options.arm	Tue Mar 24 18:46:01 2015	(r280452)
@@ -39,6 +39,8 @@ SOCDEV_PA		opt_global.h
 SOCDEV_VA		opt_global.h
 PV_STATS		opt_pmap.h
 QEMU_WORKAROUNDS	opt_global.h
+SOC_BCM2835		opt_global.h
+SOC_BCM2836		opt_global.h
 SOC_MV_ARMADAXP		opt_global.h
 SOC_MV_DISCOVERY	opt_global.h
 SOC_MV_DOVE		opt_global.h