From: jasper <jasper@openbsd.org>
Date: Sun, 13 Jul 2014 18:07:38 +0000 (+0000)
Subject: consistency with upcoming bootloader device parsing of the uboot arguments,
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7595788f6381b4b57d1d75f5923ccb70572ce660;p=openbsd

consistency with upcoming bootloader device parsing of the uboot arguments,
root= becomes rootdev=
---

diff --git a/sys/arch/octeon/octeon/autoconf.c b/sys/arch/octeon/octeon/autoconf.c
index 3a3d081af29..b78c3fa54b9 100644
--- a/sys/arch/octeon/octeon/autoconf.c
+++ b/sys/arch/octeon/octeon/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.4 2013/04/08 09:42:26 jasper Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.5 2014/07/13 18:07:38 jasper Exp $	*/
 /*
  * Copyright (c) 2009 Miodrag Vallat.
  *
@@ -51,7 +51,7 @@ parse_uboot_root(void)
 	size_t len;
 
         /*
-         * Turn the U-Boot root device (root=/dev/octcf0) into a boot device.
+         * Turn the U-Boot root device (rootdev=/dev/octcf0) into a boot device.
          */
         p = strrchr(uboot_rootdev, '/');
         if (p == NULL)
diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c
index e6df5a11363..37ae6c00f07 100644
--- a/sys/arch/octeon/octeon/machdep.c
+++ b/sys/arch/octeon/octeon/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.56 2014/07/13 14:16:09 jasper Exp $ */
+/*	$OpenBSD: machdep.c,v 1.57 2014/07/13 18:07:38 jasper Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -626,9 +626,9 @@ process_bootargs(void)
 
 		/*
 		 * XXX: We currently only expect one other argument,
-		 * argv[1], root=ROOTDEV.
+		 * argv[1], rootdev=ROOTDEV.
 		 */
-		if (strncmp(arg, "root=", 5) == 0) {
+		if (strncmp(arg, "rootdev=", 8) == 0) {
 			if (*uboot_rootdev == '\0') {
 				strlcpy(uboot_rootdev, arg,
 					sizeof(uboot_rootdev));