diff options
| author | adrian <adrian@FreeBSD.org> | 2016-05-10 22:38:39 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2016-05-10 22:38:39 +0000 |
| commit | d089d0b662b561f05674f6defd6ce674890e6df9 (patch) | |
| tree | 891556a8a589a39463faa856b54728a4145877f3 | |
| parent | 03739a0cd03ee8f3b8a1859e4943a6485e882022 (diff) | |
| download | FreeBSD-src-d089d0b662b561f05674f6defd6ce674890e6df9.zip FreeBSD-src-d089d0b662b561f05674f6defd6ce674890e6df9.tar.gz | |
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.
| -rw-r--r-- | sys/conf/files | 8 | ||||
| -rw-r--r-- | sys/mips/conf/SENTRY5 | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/conf/files b/sys/conf/files index a903336..54c55d7 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -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 diff --git a/sys/mips/conf/SENTRY5 b/sys/mips/conf/SENTRY5 index 51cc011..02786a0 100644 --- a/sys/mips/conf/SENTRY5 +++ b/sys/mips/conf/SENTRY5 @@ -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 |
