Switch mips/sentry5 to bhnd(4), and unify with mips/broadcom

Now that bhnd(4) provides feature parity with the previous siba/mips
implementation, we can switch sentry5 over and begin lifting common
support code out for use across bhnd(4) embedded targets.

Changes:

- Fixed enumeration of siba(4) per-core address maps, required for
  discovery of memory mapped chipc flash region on siba(4) devices.
- Simplified bhnd kernel configuration (dropped 'bhndbus' option).
- Replaced files.broadcom's direct file references with their
  corresponding standard kernel options.
- Lifted out common bcma/siba nexus support, inheriting from the new
  generic bhnd_nexus driver.
- Dropped now-unused sentry5 siba code.
- Re-integrated BCM into the universe build now that it actually compiles.

Approved by:	adrian (mentor)
Differential Revision:	https://reviews.freebsd.org/D6712

5 files changed, 18 insertions, 39 deletions

diff --git a/sys/mips/broadcom/files.broadcom b/sys/mips/broadcom/files.broadcom
index ac5c645..10564d9 100644
--- a/sys/mips/broadcom/files.broadcom
+++ b/sys/mips/broadcom/files.broadcom
@@ -17,31 +17,5 @@ mips/broadcom/uart_bus_chipc.c		optional uart
 mips/broadcom/bcm_socinfo.c		standard
 mips/broadcom/bcm_mipscore.c		standard
 
-#
+# TODO: Replace with BCM47xx/57xx/etc-aware geom_map
 geom/geom_flashmap.c			standard
-#
-dev/bhnd/bhnd.c				standard
-dev/bhnd/bhnd_subr.c			standard
-dev/bhnd/bhnd_bus_if.m			standard
-dev/bhnd/bhndb/bhndb_if.m		standard
-dev/bhnd/bhndb/bhndb_bus_if.m		standard
-dev/bhnd/bcma/bcma.c			standard
-dev/bhnd/bcma/bcma_nexus.c		standard
-#dev/bhnd/bcma/bcma_bhndb.c		standard
-dev/bhnd/bcma/bcma_erom.c		standard
-dev/bhnd/bcma/bcma_subr.c		standard
-dev/bhnd/cores/chipc/chipc_subr.c	standard
-dev/bhnd/cores/chipc/chipc_cfi.c	optional cfi 
-dev/bhnd/cores/chipc/chipc_spi.c	optional spibus
-dev/bhnd/cores/chipc/chipc_slicer.c	optional cfi | spibus 
-dev/bhnd/cores/chipc/chipc.c		standard
-#to remove 
-#dev/bhnd/cores/chipc/chipcbus.c		standard
-dev/bhnd/cores/chipc/bhnd_chipc_if.m	standard
-dev/bhnd/nvram/bhnd_nvram_if.m		standard
-#dev/bhnd/siba/siba.c			standard
-#dev/bhnd/siba/siba_bhndb.c		standard
-#dev/bhnd/siba/siba_nexus.c		standard
-#dev/bhnd/siba/siba_subr.c		standard
-dev/bhnd/soc/bhnd_soc.c			standard
-#
\ No newline at end of file
diff --git a/sys/mips/conf/BCM b/sys/mips/conf/BCM
index e2215f7..790d3cb 100644
--- a/sys/mips/conf/BCM
+++ b/sys/mips/conf/BCM
@@ -5,8 +5,6 @@
 # used in COTS hardware including the ASUS RT-N12, RT-N16, RT-N53.
 #
 
-#NO_UNIVERSE
-
 ident		BCM
 
 hints		"BCM.hints"
@@ -57,10 +55,15 @@ options 	INVARIANT_SUPPORT
 #options	VERBOSE_SYSINIT
 #makeoptions	VERBOSE_SYSINIT
 
+# bhnd(4)
+device		bhnd
+device		bcma			# bcma backplane
+device		bcma_nexus
+
 device		pci
+device		bhnd_pcib		# PCIe-G1 core
 
 #device		bgmac			# Broadcom GMAC - not yet
-device		bhnd
 
 device		mdio
 
diff --git a/sys/mips/conf/BCM.hints b/sys/mips/conf/BCM.hints
index 5fdd240..742e987 100644
--- a/sys/mips/conf/BCM.hints
+++ b/sys/mips/conf/BCM.hints
@@ -1,6 +1,5 @@
 # $FreeBSD$
-hint.bhnd_soc.0.at="nexus0"
-# XXX ?
-hint.bhnd_soc.0.maddr="0x00000000" 
-hint.bhnd_soc.0.msize="0x20000000"
+hint.bhnd.0.at="nexus0"
+hint.bhnd.0.maddr="0x18000000" 
+hint.bhnd.0.msize="0x00100000"
 
diff --git a/sys/mips/conf/SENTRY5 b/sys/mips/conf/SENTRY5
index 02786a0..063ab63 100644
--- a/sys/mips/conf/SENTRY5
+++ b/sys/mips/conf/SENTRY5
@@ -57,8 +57,11 @@ options 	INVARIANT_SUPPORT
 #options 	BUS_DEBUG
 #makeoptions	BUS_DEBUG
 
-device		siba_s5			# Sonics SiliconBackplane
-device		pci			# siba_pcib
+device		bhnd
+device		siba
+device		siba_nexus
+device		bhnd_pcib
+device		pci			# bhnd_pcib
 
 # device 	bfe			# XXX will build both pci and siba
 # device 	miibus			# attachments
diff --git a/sys/mips/conf/SENTRY5.hints b/sys/mips/conf/SENTRY5.hints
index 0ee471e..0f78f92 100644
--- a/sys/mips/conf/SENTRY5.hints
+++ b/sys/mips/conf/SENTRY5.hints
@@ -1,5 +1,5 @@
 # $FreeBSD$
-hint.siba.0.at="nexus0"
-hint.siba.0.maddr="0x18000000"
-hint.siba.0.msize="0x1000"
+hint.bhnd.0.at="nexus0"
+hint.bhnd.0.maddr="0x18000000"
+hint.bhnd.0.msize="0x1000"
 # XXX irq?