svn commit: r336772 - in head/sys/arm: conf ralink

[Warner Losh]

Author: imp
Date: Fri Jul 27 18:31:30 2018
New Revision: 336772
URL: https://svnweb.freebsd.org/changeset/base/336772

Log:
  Make ralink compile again.
  
  Add std.ralink to define common things across all ralink configs.
  Add cpu, machine and options INTRNG to this file.
  Remove RT1310.hints file reference: that file isn't in our tree.

Added:
  head/sys/arm/ralink/std.ralink   (contents, props changed)
Modified:
  head/sys/arm/conf/RT1310
  head/sys/arm/ralink/rt1310_intc.c

Modified: head/sys/arm/conf/RT1310
==============================================================================
--- head/sys/arm/conf/RT1310	Fri Jul 27 18:30:01 2018	(r336771)
+++ head/sys/arm/conf/RT1310	Fri Jul 27 18:31:30 2018	(r336772)
@@ -8,7 +8,7 @@
 
 ident		RT1310
 include 	"std.arm"
-hints		"RT1310.hints"
+include 	"../ralink/std.ralink"
 
 # Flattened Device Tree
 options 	FDT

Modified: head/sys/arm/ralink/rt1310_intc.c
==============================================================================
--- head/sys/arm/ralink/rt1310_intc.c	Fri Jul 27 18:30:01 2018	(r336771)
+++ head/sys/arm/ralink/rt1310_intc.c	Fri Jul 27 18:31:30 2018	(r336772)
@@ -140,7 +140,7 @@ rt1310_intc_probe(device_t dev)
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
 
-	if (!ofw_bus_is_compatible(dev, "rt,pic"))
+	if (!ofw_bus_is_compatible_strict(dev, "rt,pic"))
 		return (ENXIO);
 
 #ifdef INTRNG

Added: head/sys/arm/ralink/std.ralink
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/arm/ralink/std.ralink	Fri Jul 27 18:31:30 2018	(r336772)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+files		"../ralink/files.ralink"
+cpu		CPU_ARM9
+machine 	arm
+options		INTRNG