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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to