From owner-svn-src-head@freebsd.org  Wed Jul  5 10:29:07 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5DC32DA79D0;
 Wed,  5 Jul 2017 10:29:07 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 25C607B3E0;
 Wed,  5 Jul 2017 10:29:07 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v65AT6Li040280;
 Wed, 5 Jul 2017 10:29:06 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v65AT5WI040276;
 Wed, 5 Jul 2017 10:29:05 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201707051029.v65AT5WI040276@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Wed, 5 Jul 2017 10:29:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r320669 - in head/sys/arm: arm conf
X-SVN-Group: head
X-SVN-Commit-Author: andrew
X-SVN-Commit-Paths: in head/sys/arm: arm conf
X-SVN-Commit-Revision: 320669
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Jul 2017 10:29:07 -0000

Author: andrew
Date: Wed Jul  5 10:29:05 2017
New Revision: 320669
URL: https://svnweb.freebsd.org/changeset/base/320669

Log:
  Make MULTIDELAY a requirement in the MPCore Timer driver when using
  PLATFORM. This will help with removing the MULTIDELAY option, enabling
  it when PLATFORM is enabled.

Modified:
  head/sys/arm/arm/mpcore_timer.c
  head/sys/arm/conf/PANDABOARD
  head/sys/arm/conf/VYBRID
  head/sys/arm/conf/ZEDBOARD

Modified: head/sys/arm/arm/mpcore_timer.c
==============================================================================
--- head/sys/arm/arm/mpcore_timer.c	Wed Jul  5 09:27:18 2017	(r320668)
+++ head/sys/arm/arm/mpcore_timer.c	Wed Jul  5 10:29:05 2017	(r320669)
@@ -71,6 +71,10 @@ __FBSDID("$FreeBSD$");
 
 #include <arm/arm/mpcore_timervar.h>
 
+#if defined(PLATFORM) && !defined(MULTIDELAY)
+#error The MPCore Timer driver requires MULTIDELAY when building with PLATFORM
+#endif
+
 /* Private (per-CPU) timer register map */
 #define PRV_TIMER_LOAD                 0x0000
 #define PRV_TIMER_COUNT                0x0004

Modified: head/sys/arm/conf/PANDABOARD
==============================================================================
--- head/sys/arm/conf/PANDABOARD	Wed Jul  5 09:27:18 2017	(r320668)
+++ head/sys/arm/conf/PANDABOARD	Wed Jul  5 10:29:05 2017	(r320669)
@@ -34,6 +34,7 @@ makeoptions	MODULES_EXTRA=dtb/omap4
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PLATFORM
+options 	MULTIDELAY
 options 	SMP			# Enable multiple cores
 
 # NFS root from boopt/dhcp

Modified: head/sys/arm/conf/VYBRID
==============================================================================
--- head/sys/arm/conf/VYBRID	Wed Jul  5 09:27:18 2017	(r320668)
+++ head/sys/arm/conf/VYBRID	Wed Jul  5 10:29:05 2017	(r320669)
@@ -26,6 +26,7 @@ makeoptions	WERROR="-Werror"
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PLATFORM		# Platform based SoC
+options 	MULTIDELAY
 #options 	NANDFS			# NAND Filesystem
 #options 	SMP			# Enable multiple cores
 

Modified: head/sys/arm/conf/ZEDBOARD
==============================================================================
--- head/sys/arm/conf/ZEDBOARD	Wed Jul  5 09:27:18 2017	(r320668)
+++ head/sys/arm/conf/ZEDBOARD	Wed Jul  5 10:29:05 2017	(r320669)
@@ -28,6 +28,7 @@ makeoptions	MODULES_EXTRA="dtb/zynq"
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PLATFORM		# Platform based SoC
+options 	MULTIDELAY
 #options 	NFSSD			# Network Filesystem Server
 options 	SMP			# Enable multiple cores