diff options
| author |   kettenis <kettenis@openbsd.org> | 2016-10-23 19:05:09 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2016-10-23 19:05:09 +0000 |
| commit | 575b9fbf3811308fcc0f06d6e2834fec49b9cbf2 (patch) | |
| tree | fe05dc8600596dcc74fce7e34104ff667542e06b /sys | |
| parent | De-platformize sunxi. This removes the board initialization code that sets up (diff) | |
| download | wireguard-openbsd-575b9fbf3811308fcc0f06d6e2834fec49b9cbf2.tar.xz wireguard-openbsd-575b9fbf3811308fcc0f06d6e2834fec49b9cbf2.zip | |
Remove sunxi board IDs.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/armv7/armv7/armv7var.h | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/armv7/intr.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/armv7/armv7/armv7var.h b/sys/arch/armv7/armv7/armv7var.h index f65361082c1..d006001b095 100644 --- a/sys/arch/armv7/armv7/armv7var.h +++ b/sys/arch/armv7/armv7/armv7var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: armv7var.h,v 1.14 2016/10/09 01:40:43 jsg Exp $ */ +/* $OpenBSD: armv7var.h,v 1.15 2016/10/23 19:05:09 kettenis Exp $ */ /* * Copyright (c) 2005,2008 Dale Rahn <drahn@openbsd.com> * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se> @@ -80,8 +80,6 @@ int armv7_submatch(struct device *, void *, void *); #define BOARD_ID_EXYNOS4_NURI 3379 #define BOARD_ID_AM335X_BEAGLEBONE 3589 #define BOARD_ID_EXYNOS5_CHROMEBOOK 3774 -#define BOARD_ID_SUN4I_A10 4104 -#define BOARD_ID_SUN7I_A20 4283 extern uint32_t board_id; #endif /* __ARMV7VAR_H__ */ diff --git a/sys/arch/armv7/armv7/intr.c b/sys/arch/armv7/armv7/intr.c index 847f124831c..3a292690237 100644 --- a/sys/arch/armv7/armv7/intr.c +++ b/sys/arch/armv7/armv7/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.9 2016/08/06 17:25:15 patrick Exp $ */ +/* $OpenBSD: intr.c,v 1.10 2016/10/23 19:05:09 kettenis Exp $ */ /* * Copyright (c) 2011 Dale Rahn <drahn@openbsd.org> * @@ -592,6 +592,9 @@ void arm_clock_register(void (*initclock)(void), void (*delay)(u_int), void (*statclock)(int), void(*mpstartclock)(void)) { + if (arm_clock_func.initclocks) + return; + arm_clock_func.initclocks = initclock; arm_clock_func.delay = delay; arm_clock_func.setstatclockrate = statclock; |