summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2017-01-23 14:02:03 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2017-01-23 14:02:03 +0000
commit6bd3a065e5914c0c3822af492c8d80a08dd2e253 (patch)
tree04e031b5f06154af6eb367a59d1ca3406fc6c44b /sys
parent1cca8957df9cc585993adbe7c602671191288970 (diff)
Enter UKC when built with BOOT_CONFIG and -c is specified.
ok kettenis@ patrick@
Diffstat (limited to 'sys')
-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
+ }
}
/*