Module Name: src
Committed By: mrg
Date: Sat Oct 28 17:53:06 UTC 2023
Modified Files:
src/sys/arch/evbarm/evbarm: autoconf.c
Log Message:
allow "root=xxx" command line to override platform defaults.
PR#57324 shows that on broadcom evbarm systems the default root
is no longer chosen, even when specified on the command line.
sc.dying and mlelstv pointed out that revision 1.24 made this
function skip parsing "root=" if already set, which was not what
i expected to happen anywhere here (and it works fine on FDT and
UEFI boots.)
revert that part of 1.24.
XXX: pullup-10.
(while this is it's own bug, it points out that
bcm283x_platform_device_register() currently will set
booted_device to the first ld@sdmmc found, even if that device was
not involved with booting. while fixing this would be nice, it
wouldn't have helped with this setup -- choosing ld@sdmmc is the
right answer in eg PR#57324 at this point, so having it set in
this case should be fine, and then overrideable via root=.)
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/evbarm/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/evbarm/evbarm/autoconf.c
diff -u src/sys/arch/evbarm/evbarm/autoconf.c:1.24 src/sys/arch/evbarm/evbarm/autoconf.c:1.25
--- src/sys/arch/evbarm/evbarm/autoconf.c:1.24 Sun Feb 5 22:42:39 2023
+++ src/sys/arch/evbarm/evbarm/autoconf.c Sat Oct 28 17:53:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.24 2023/02/05 22:42:39 mrg Exp $ */
+/* $NetBSD: autoconf.c,v 1.25 2023/10/28 17:53:06 mrg Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.24 2023/02/05 22:42:39 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.25 2023/10/28 17:53:06 mrg Exp $");
#include "opt_md.h"
#include "opt_ddb.h"
@@ -108,9 +108,6 @@ set_root_device(void)
char *ptr, *end, *buf;
size_t len;
- if (booted_device)
- return;
-
if (boot_args == NULL)
return;
