Module Name: src
Committed By: jakllsch
Date: Mon Jan 21 20:42:22 UTC 2013
Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c
Log Message:
Assume the first ld@sdmmc to attach is the booted device until
possibily-otherwise specified during evbarm cpu_rootconf().
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/rpi/rpi_machdep.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/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.29 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.30
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.29 Sat Jan 19 17:45:28 2013
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Mon Jan 21 20:42:22 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_machdep.c,v 1.29 2013/01/19 17:45:28 jmcneill Exp $ */
+/* $NetBSD: rpi_machdep.c,v 1.30 2013/01/21 20:42:22 jakllsch Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.29 2013/01/19 17:45:28 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.30 2013/01/21 20:42:22 jakllsch Exp $");
#include "opt_evbarm_boardtype.h"
@@ -738,6 +738,12 @@ rpi_device_register(device_t dev, void *
prop_dictionary_set_uint32(dict,
"frequency", vb.vbt_emmcclockrate.rate);
}
+ if (booted_device == NULL &&
+ device_is_a(dev, "ld") &&
+ device_is_a(device_parent(dev), "sdmmc")) {
+ booted_partition = 0;
+ booted_device = dev;
+ }
#endif
if (device_is_a(dev, "usmsc") &&
vcprop_tag_success_p(&vb.vbt_macaddr.tag)) {
