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.
This commit is contained in:
Adrian Chadd 2016-05-10 22:38:39 +00:00
parent 5f0263c120
commit 0c3833fbcb
2 changed files with 5 additions and 6 deletions

View File

@ -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

View File

@ -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