svn commit: r266355 - stable/10/sys/arm/conf

[Ian Lepore]

Author: ian
Date: Sat May 17 21:18:08 2014
New Revision: 266355
URL: http://svnweb.freebsd.org/changeset/base/266355

Log:
  MFC 264137:  Switch wandboards over to the common IMX6 kernel config, which
  has SMP enabled.  Also switch IMX6 to use SCHED_ULE.

Modified:
  stable/10/sys/arm/conf/IMX6
  stable/10/sys/arm/conf/WANDBOARD-DUAL
  stable/10/sys/arm/conf/WANDBOARD-QUAD
  stable/10/sys/arm/conf/WANDBOARD-SOLO
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/conf/IMX6
==============================================================================
--- stable/10/sys/arm/conf/IMX6	Sat May 17 21:10:03 2014	(r266354)
+++ stable/10/sys/arm/conf/IMX6	Sat May 17 21:18:08 2014	(r266355)
@@ -1,4 +1,4 @@
-# Kernel configuration for Wandboard
+# Kernel configuration for Freescale i.MX6 systems.
 #
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
@@ -20,8 +20,8 @@
 ident		IMX6
 include 	"../freescale/imx/std.imx6"
 
-options  	HZ=250			# Scheduling quantum is 4 milliseconds.
-options  	SCHED_4BSD		# 4BSD scheduler
+options  	HZ=500			# Scheduling quantum is 2 milliseconds.
+options  	SCHED_ULE		# ULE scheduler
 options  	PREEMPTION		# Enable kernel thread preemption
 options  	INET			# InterNETworking
 options  	INET6			# IPv6 communications protocols

Modified: stable/10/sys/arm/conf/WANDBOARD-DUAL
==============================================================================
--- stable/10/sys/arm/conf/WANDBOARD-DUAL	Sat May 17 21:10:03 2014	(r266354)
+++ stable/10/sys/arm/conf/WANDBOARD-DUAL	Sat May 17 21:18:08 2014	(r266355)
@@ -17,7 +17,7 @@
 #
 # $FreeBSD$
 
-include  	"WANDBOARD.common"
+include  	"IMX6"
 ident		WANDBOARD-DUAL
 
 # Flattened Device Tree

Modified: stable/10/sys/arm/conf/WANDBOARD-QUAD
==============================================================================
--- stable/10/sys/arm/conf/WANDBOARD-QUAD	Sat May 17 21:10:03 2014	(r266354)
+++ stable/10/sys/arm/conf/WANDBOARD-QUAD	Sat May 17 21:18:08 2014	(r266355)
@@ -17,7 +17,7 @@
 #
 # $FreeBSD$
 
-include  	"WANDBOARD.common"
+include  	"IMX6"
 ident		WANDBOARD-QUAD
 
 # Flattened Device Tree

Modified: stable/10/sys/arm/conf/WANDBOARD-SOLO
==============================================================================
--- stable/10/sys/arm/conf/WANDBOARD-SOLO	Sat May 17 21:10:03 2014	(r266354)
+++ stable/10/sys/arm/conf/WANDBOARD-SOLO	Sat May 17 21:18:08 2014	(r266355)
@@ -17,7 +17,7 @@
 #
 # $FreeBSD$
 
-include  	"WANDBOARD.common"
+include  	"IMX6"
 ident		WANDBOARD-SOLO
 
 # Flattened Device Tree