summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorPatrick Wildt <patrick@cvs.openbsd.org>2017-01-23 13:41:46 +0000
committerPatrick Wildt <patrick@cvs.openbsd.org>2017-01-23 13:41:46 +0000
commit0d9512f2e351267c1cb8966f48e87eb3f826bb31 (patch)
tree32602749a1fa9b7215a9128b2e0be1aadc7a000f /sys
parent262b6a69f06e07cd8dd864d414a34bb7c2816157 (diff)
Initialize DDB if compiled with option DDB.
ok kettenis@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/arm64/arm64/machdep.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/sys/arch/arm64/arm64/machdep.c b/sys/arch/arm64/arm64/machdep.c
index 6775a7f421a..5761d29942e 100644
--- a/sys/arch/arm64/arm64/machdep.c
+++ b/sys/arch/arm64/arm64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.5 2017/01/20 08:03:21 patrick Exp $ */
+/* $OpenBSD: machdep.c,v 1.6 2017/01/23 13:41:45 patrick Exp $ */
/*
* Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
*
@@ -44,6 +44,9 @@
#include <machine/bus.h>
#include <arm64/arm64/arm64var.h>
+#include <machine/db_machdep.h>
+#include <ddb/db_extern.h>
+
char *boot_args = NULL;
char *boot_file = "";
@@ -947,7 +950,15 @@ int pmap_bootstrap_bs_map(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size,
pmap_physload_avail();
- //early_boot = 0;
+#ifdef DDB
+ db_machine_init();
+
+ /* Firmware doesn't load symbols. */
+ ddb_init();
+
+ if (boothowto & RB_KDB)
+ Debugger();
+#endif
softintr_init();
splraise(IPL_IPI);