Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/evbarm/rpi Assume the first ld@sdmmc to attach is t...



details:   https://anonhg.NetBSD.org/src/rev/b4faa0cc79f5
branches:  trunk
changeset: 784202:b4faa0cc79f5
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Mon Jan 21 20:42:22 2013 +0000

description:
Assume the first ld@sdmmc to attach is the booted device until
possibily-otherwise specified during evbarm cpu_rootconf().

diffstat:

 sys/arch/evbarm/rpi/rpi_machdep.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 0ab9fe8d785e -r b4faa0cc79f5 sys/arch/evbarm/rpi/rpi_machdep.c
--- a/sys/arch/evbarm/rpi/rpi_machdep.c Mon Jan 21 20:28:38 2013 +0000
+++ b/sys/arch/evbarm/rpi/rpi_machdep.c Mon Jan 21 20:42:22 2013 +0000
@@ -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 @@
                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)) {



Home | Main Index | Thread Index | Old Index