summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2017-01-23 14:02:02 +0000
committerjsg <jsg@openbsd.org>2017-01-23 14:02:02 +0000
commit222fb528e9f3e13e2caddb28b3fc5056b7d8d202 (patch)
tree3574f30ceb1f22ea14b3552b43d243ad0f30328e
parentEnable USBVERBOSE on both the GENERIC and RAMDISK kernel. (diff)
downloadwireguard-openbsd-222fb528e9f3e13e2caddb28b3fc5056b7d8d202.tar.xz
wireguard-openbsd-222fb528e9f3e13e2caddb28b3fc5056b7d8d202.zip
Enter UKC when built with BOOT_CONFIG and -c is specified.
ok kettenis@ patrick@
-rw-r--r--sys/arch/arm64/arm64/machdep.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/arch/arm64/arm64/machdep.c b/sys/arch/arm64/arm64/machdep.c
index 5761d29942e..8d38a4d6604 100644
--- a/sys/arch/arm64/arm64/machdep.c
+++ b/sys/arch/arm64/arm64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.6 2017/01/23 13:41:45 patrick Exp $ */
+/* $OpenBSD: machdep.c,v 1.7 2017/01/23 14:02:02 jsg Exp $ */
/*
* Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
*
@@ -286,6 +286,14 @@ cpu_startup()
curpcb = &proc0.p_addr->u_pcb;
curpcb->pcb_flags = 0;
curpcb->pcb_tf = &proc0tf;
+
+ if (boothowto & RB_CONFIG) {
+#ifdef BOOT_CONFIG
+ user_config();
+#else
+ printf("kernel does not support -c; continuing..\n");
+#endif
+ }
}
/*