svn commit: r320669 - in head/sys/arm: arm conf

[Andrew Turner]

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