From owner-svn-src-all@freebsd.org Tue May 10 22:38:41 2016 Return-Path: Delivered-To: svn-src-all@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 4A5F4B36406; Tue, 10 May 2016 22:38:41 +0000 (UTC) (envelope-from adrian@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 019901D99; Tue, 10 May 2016 22:38:40 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4AMce1i000553; Tue, 10 May 2016 22:38:40 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4AMcehY000551; Tue, 10 May 2016 22:38:40 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201605102238.u4AMcehY000551@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Tue, 10 May 2016 22:38:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299394 - in head/sys: conf mips/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 May 2016 22:38:41 -0000 Author: adrian Date: Tue May 10 22:38:39 2016 New Revision: 299394 URL: https://svnweb.freebsd.org/changeset/base/299394 Log: Rename siba -> siba_s5, to specifically reference that it's for the legacy siba sentry5 cpu glue. The siba_cc code is the hard-coded chipcommon bits for the sentry s5, which will eventually be replaced with the more flexible bhnd sipa/cc code. bwn, etc uses siba_bwn, which doesn't use siba or siba_cc to do anything. Modified: head/sys/conf/files head/sys/mips/conf/SENTRY5 Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Tue May 10 22:32:23 2016 (r299393) +++ head/sys/conf/files Tue May 10 22:38:39 2016 (r299394) @@ -2441,10 +2441,10 @@ dev/si/si_eisa.c optional si eisa dev/si/si_isa.c optional si isa dev/si/si_pci.c optional si pci dev/siba/siba_bwn.c optional siba_bwn pci -dev/siba/siba_cc.c optional siba !bhnd !bhndbus -dev/siba/siba_core.c optional siba | siba_bwn pci -dev/siba/siba_mips.c optional siba !bhnd !bhndbus -dev/siba/siba_pcib.c optional siba pci !bhnd !bhndbus +dev/siba/siba_cc.c optional siba_s5 !bhnd !bhndbus +dev/siba/siba_core.c optional siba_s5 | siba_bwn pci +dev/siba/siba_mips.c optional siba_s5 !bhnd !bhndbus +dev/siba/siba_pcib.c optional siba_s5 pci !bhnd !bhndbus dev/siis/siis.c optional siis pci dev/sis/if_sis.c optional sis pci dev/sk/if_sk.c optional sk pci Modified: head/sys/mips/conf/SENTRY5 ============================================================================== --- head/sys/mips/conf/SENTRY5 Tue May 10 22:32:23 2016 (r299393) +++ head/sys/mips/conf/SENTRY5 Tue May 10 22:38:39 2016 (r299394) @@ -57,8 +57,7 @@ options INVARIANT_SUPPORT #options BUS_DEBUG #makeoptions BUS_DEBUG -device bhndbus # Broadcom Home Networking Division Bus -device siba # Sonics SiliconBackplane +device siba_s5 # Sonics SiliconBackplane device pci # siba_pcib # device bfe # XXX will build both pci and siba