svn commit: r308846 - in head/sys: conf mips/atheros/ar531x mips/broadcom mips/mediatek

[Ruslan Bukin]

Author: br
Date: Sat Nov 19 17:01:06 2016
New Revision: 308846
URL: https://svnweb.freebsd.org/changeset/base/308846

Log:
  Move intrng includes to the main MIPS includes file.
  
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/conf/files.mips
  head/sys/mips/atheros/ar531x/files.ar5315
  head/sys/mips/broadcom/files.broadcom
  head/sys/mips/mediatek/files.mediatek

Modified: head/sys/conf/files.mips
==============================================================================
--- head/sys/conf/files.mips	Sat Nov 19 16:36:38 2016	(r308845)
+++ head/sys/conf/files.mips	Sat Nov 19 17:01:06 2016	(r308846)
@@ -97,6 +97,13 @@ dev/hwpmc/hwpmc_mips74k.c		optional	hwpm
 # ofw support
 dev/ofw/ofwpci.c			optional	fdt pci
 
+# INTRNG support code
+kern/msi_if.m				optional	intrng
+kern/pic_if.m				optional	intrng
+kern/subr_intr.c			optional	intrng
+# INTRNG compatible MIPS32 interrupt controller
+mips/mips/mips_pic.c			optional	intrng
+
 # DTrace
 cddl/compat/opensolaris/kern/opensolaris_atomic.c	optional zfs | dtrace compile-with "${CDDL_C}"
 cddl/dev/dtrace/mips/dtrace_asm.S			optional dtrace compile-with "${DTRACE_S}"

Modified: head/sys/mips/atheros/ar531x/files.ar5315
==============================================================================
--- head/sys/mips/atheros/ar531x/files.ar5315	Sat Nov 19 16:36:38 2016	(r308845)
+++ head/sys/mips/atheros/ar531x/files.ar5315	Sat Nov 19 17:01:06 2016	(r308846)
@@ -18,14 +18,5 @@ mips/mips/tick.c				standard
 
 dev/etherswitch/e6000sw/e6060sw.c		optional etherswitch
 
-# Hack to reuse ARM intrng code
-kern/subr_intr.c				optional intrng
-kern/msi_if.m					optional intrng
-kern/pic_if.m					optional intrng
-
-# Intrng compatible MIPS32 interrupt controller
-mips/mips/mips_pic.c				optional intrng
-
 # Non Intrng
 mips/mips/intr_machdep.c			optional !intrng
-

Modified: head/sys/mips/broadcom/files.broadcom
==============================================================================
--- head/sys/mips/broadcom/files.broadcom	Sat Nov 19 16:36:38 2016	(r308845)
+++ head/sys/mips/broadcom/files.broadcom	Sat Nov 19 17:01:06 2016	(r308846)
@@ -9,11 +9,6 @@ mips/broadcom/bcm_bmips.c		optional siba
 mips/broadcom/bcm_mips74k.c		optional bcma_nexus bcma
 mips/broadcom/bcm_pmu.c			standard
 mips/mips/tick.c			standard
-mips/mips/mips_pic.c			standard
-kern/subr_intr.c			standard
-kern/pic_if.m				standard
-
-kern/msi_if.m				optional intrng
 
 mips/broadcom/uart_cpu_chipc.c		optional uart
 mips/broadcom/uart_bus_chipc.c		optional uart

Modified: head/sys/mips/mediatek/files.mediatek
==============================================================================
--- head/sys/mips/mediatek/files.mediatek	Sat Nov 19 16:36:38 2016	(r308845)
+++ head/sys/mips/mediatek/files.mediatek	Sat Nov 19 17:01:06 2016	(r308846)
@@ -26,14 +26,6 @@ mips/mediatek/mtk_gpio_v2.c 		optional g
 # Ralink/Mediatek Ethernet driver
 dev/rt/if_rt.c 				optional rt
 
-# Hack to reuse ARM intrng code
-kern/subr_intr.c 			standard
-kern/msi_if.m 				standard
-kern/pic_if.m 				standard
-
-# Intrng compatible MIPS32 interrupt controller
-mips/mips/mips_pic.c 			standard
-
 # Standard MIPS ticker
 mips/mips/tick.c 			standard