From owner-svn-src-head@freebsd.org Fri Jul 27 18:31:32 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 45BEE10532A5; Fri, 27 Jul 2018 18:31:32 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F085D81C6C; Fri, 27 Jul 2018 18:31:31 +0000 (UTC) (envelope-from imp@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D2E2F1B7CF; Fri, 27 Jul 2018 18:31:31 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6RIVVsx018190; Fri, 27 Jul 2018 18:31:31 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6RIVVxW018188; Fri, 27 Jul 2018 18:31:31 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201807271831.w6RIVVxW018188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 27 Jul 2018 18:31:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336772 - in head/sys/arm: conf ralink X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/arm: conf ralink X-SVN-Commit-Revision: 336772 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.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jul 2018 18:31:32 -0000 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