Don't unconditionally compile-in the bcache code. It's only used on

i386/amd64 and pc98. Remove useless calls to bcache_init() from the
ia64 and sparc64 loaders, as well as from the OFW common code.

7 files changed, 10 insertions, 18 deletions

diff --git a/sys/boot/common/Makefile.inc b/sys/boot/common/Makefile.inc
index bc18830..753d112 100644
--- a/sys/boot/common/Makefile.inc
+++ b/sys/boot/common/Makefile.inc
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SRCS+=	bcache.c boot.c commands.c console.c devopen.c interp.c 
+SRCS+=	boot.c commands.c console.c devopen.c interp.c 
 SRCS+=	interp_backslash.c interp_parse.c ls.c misc.c 
 SRCS+=	module.c panic.c
 
@@ -19,6 +19,10 @@ SRCS+=	load_elf64.c reloc_elf64.c
 SRCS+=	dev_net.c
 .endif
 
+.if defined(HAVE_BCACHE)
+SRCS+=  bcache.c
+.endif
+
 # Machine-independant ISA PnP
 .if defined(HAVE_ISABUS)
 SRCS+=	isapnp.c
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 6b260fa..ce9b2c1 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -16,6 +16,9 @@ CFLAGS+=	-DLOADER_TFTP_SUPPORT
 CFLAGS+=	-DLOADER_NFS_SUPPORT
 .endif
 
+# Include bcache code.
+HAVE_BCACHE=	yes
+
 # Enable PnP and ISA-PnP code.
 HAVE_PNP=	yes
 HAVE_ISABUS=	yes
diff --git a/sys/boot/ia64/efi/main.c b/sys/boot/ia64/efi/main.c
index 69b6387..8cc0a04 100644
--- a/sys/boot/ia64/efi/main.c
+++ b/sys/boot/ia64/efi/main.c
@@ -112,11 +112,6 @@ main(int argc, CHAR16 *argv[])
 	 */
 	cons_probe();
 
-	/*
-	 * Initialise the block cache
-	 */
-	bcache_init(32, 512);		/* 16k XXX tune this */
-
 	find_pal_proc();
 
 	/*
diff --git a/sys/boot/ia64/ski/main.c b/sys/boot/ia64/ski/main.c
index 8660518..f27d166 100644
--- a/sys/boot/ia64/ski/main.c
+++ b/sys/boot/ia64/ski/main.c
@@ -73,11 +73,6 @@ ski_main(void)
 	cons_probe();
 
 	/*
-	 * Initialise the block cache
-	 */
-	bcache_init(32, 512);		/* 16k XXX tune this */
-
-	/*
 	 * March through the device switch probing for things.
 	 */
 	for (i = 0; devsw[i] != NULL; i++)
diff --git a/sys/boot/ofw/common/main.c b/sys/boot/ofw/common/main.c
index 2fdd293..2a6dd1c 100644
--- a/sys/boot/ofw/common/main.c
+++ b/sys/boot/ofw/common/main.c
@@ -125,11 +125,6 @@ main(int (*openfirm)(void *))
 	init_heap();
 
 	/*
-	 * Initialise the block cache
-	 */
-	bcache_init(32, 512);		/* 16k XXX tune this */
-
-	/*
 	 * March through the device switch probing for things.
 	 */
 	for (i = 0; devsw[i] != NULL; i++)
diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile
index 53ec657..0ad93c1 100644
--- a/sys/boot/pc98/loader/Makefile
+++ b/sys/boot/pc98/loader/Makefile
@@ -17,6 +17,8 @@ CFLAGS+=	-DLOADER_TFTP_SUPPORT
 CFLAGS+=	-DLOADER_NFS_SUPPORT
 .endif
 
+HAVE_BCACHE=	yes
+
 # Enable PnP and ISA-PnP code.
 HAVE_PNP=	yes
 HAVE_ISABUS=	yes
diff --git a/sys/boot/sparc64/loader/main.c b/sys/boot/sparc64/loader/main.c
index 1361785..b62570d 100644
--- a/sys/boot/sparc64/loader/main.c
+++ b/sys/boot/sparc64/loader/main.c
@@ -487,8 +487,6 @@ main(int (*openfirm)(void *))
 
 	mmu_ops->tlb_init();
 
-	bcache_init(32, 512);
-
 	/*
 	 * Initialize devices.
 	 */