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.
This commit is contained in:
parent
9e264172bd
commit
5cae408f81
@ -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
|
||||
|
@ -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
|
||||
|
@ -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();
|
||||
|
||||
/*
|
||||
|
@ -72,11 +72,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.
|
||||
*/
|
||||
|
@ -124,11 +124,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.
|
||||
*/
|
||||
|
@ -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
|
||||
|
@ -487,8 +487,6 @@ main(int (*openfirm)(void *))
|
||||
|
||||
mmu_ops->tlb_init();
|
||||
|
||||
bcache_init(32, 512);
|
||||
|
||||
/*
|
||||
* Initialize devices.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user