Module Name: src Committed By: jmcneill Date: Sat Jan 10 14:07:26 UTC 2015
Modified Files: src/sys/arch/evbmips/loongson: autoconf.c Log Message: if MEMORY_DISK_IS_ROOT is defined, dont try to guess the root device To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/loongson/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/evbmips/loongson/autoconf.c diff -u src/sys/arch/evbmips/loongson/autoconf.c:1.5 src/sys/arch/evbmips/loongson/autoconf.c:1.6 --- src/sys/arch/evbmips/loongson/autoconf.c:1.5 Wed Mar 13 21:17:43 2013 +++ src/sys/arch/evbmips/loongson/autoconf.c Sat Jan 10 14:07:26 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.5 2013/03/13 21:17:43 macallan Exp $ */ +/* $NetBSD: autoconf.c,v 1.6 2015/01/10 14:07:26 jmcneill Exp $ */ /* * Copyright 2002 Wasabi Systems, Inc. @@ -35,8 +35,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_md.h" + #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2013/03/13 21:17:43 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.6 2015/01/10 14:07:26 jmcneill Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -46,7 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v #include <sys/cpu.h> #include <evbmips/loongson/autoconf.h> +#ifndef MEMORY_DISK_IS_ROOT static void findroot(void); +#endif enum devclass bootdev_class = DV_DULL; char bootdev[16]; @@ -74,7 +78,9 @@ cpu_configure(void) void cpu_rootconf(void) { +#ifndef MEMORY_DISK_IS_ROOT findroot(); +#endif printf("boot device: %s\n", booted_device ? device_xname(booted_device) : "<unknown>"); @@ -85,6 +91,7 @@ cpu_rootconf(void) extern char bootstring[]; extern int netboot; +#ifndef MEMORY_DISK_IS_ROOT static void findroot(void) { @@ -111,6 +118,7 @@ findroot(void) return; } +#endif void device_register(device_t dev, void *aux)