Revert "arm64: WORKAROUND: boot in single user mode"

This reverts commit 97a8273956347c73c65ad68dcbdc781ae7b3def7.

diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c
index 09c4f481d556f64d2d4af0487747713ce8a326b5..5b058786329ab5b17fc59daded96d6a67d565666 100644 (file)
--- a/sys/arm64/arm64/machdep.c
+++ b/sys/arm64/arm64/machdep.c
@@ -810,7 +810,6 @@ initarm(struct arm64_bootparams *abp)
                kmdp = preload_search_by_type("elf64 kernel");
 
        boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int);
-       boothowto |= RB_SINGLE;
        kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *);
 
 #ifdef FDT

diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC
index c06d857a11902ed4044a9e840def619d797cc10f..5adaf6484125f6ca605bf0aa91dfd0ca1bcc86aa 100644 (file)
--- a/sys/arm64/conf/GENERIC
+++ b/sys/arm64/conf/GENERIC
@@ -23,8 +23,6 @@ ident         GENERIC
 
 makeoptions    DEBUG=-g                # Build kernel with gdb(1) debug symbols
 makeoptions    NO_MODULES=1            # We don't yet support modules on arm64
-options        ROOTDEVNAME=\"ufs:xbd0s2\"
-
 
 options                XENHVM
 options        SCHED_ULE               # ULE scheduler