diff options
| author |   visa <visa@openbsd.org> | 2016-12-17 13:13:57 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2016-12-17 13:13:57 +0000 |
| commit | e41f3ba364e37b6c5c298ea5c0e1ecb9f657d699 (patch) | |
| tree | 785fdb7f7d0b5081f8043966f6a0a08e10b2322f | |
| parent | Make Octeon model strings a bit more specific. While there, (diff) | |
| download | wireguard-openbsd-e41f3ba364e37b6c5c298ea5c0e1ecb9f657d699.tar.xz wireguard-openbsd-e41f3ba364e37b6c5c298ea5c0e1ecb9f657d699.zip | |
There is no RTC on Shasta, so do not attach the driver.
| -rw-r--r-- | sys/arch/octeon/dev/octrtc.c | 5 | ||||
| -rw-r--r-- | sys/arch/octeon/include/octeonvar.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/arch/octeon/dev/octrtc.c b/sys/arch/octeon/dev/octrtc.c index 8b8b5e4d8fe..8dd090abf8c 100644 --- a/sys/arch/octeon/dev/octrtc.c +++ b/sys/arch/octeon/dev/octrtc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: octrtc.c,v 1.4 2014/10/26 15:13:04 jasper Exp $ */ +/* $OpenBSD: octrtc.c,v 1.5 2016/12/17 13:13:57 visa Exp $ */ /* * Copyright (c) 2013, 2014 Paul Irofti. @@ -85,7 +85,8 @@ octrtc_match(struct device *parent, void *match, void *aux) return 0; /* No RTC on Ubiquiti */ if ((octeon_boot_info->board_type == BOARD_TYPE_UBIQUITI_E100) || - (octeon_boot_info->board_type == BOARD_TYPE_UBIQUITI_E200)) + (octeon_boot_info->board_type == BOARD_TYPE_UBIQUITI_E200) || + (octeon_boot_info->board_type == BOARD_TYPE_RHINOLABS_SHASTA)) return 0; return 1; } diff --git a/sys/arch/octeon/include/octeonvar.h b/sys/arch/octeon/include/octeonvar.h index 5b3ac64eeaf..2fed2082f4c 100644 --- a/sys/arch/octeon/include/octeonvar.h +++ b/sys/arch/octeon/include/octeonvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: octeonvar.h,v 1.32 2016/10/29 11:00:19 visa Exp $ */ +/* $OpenBSD: octeonvar.h,v 1.33 2016/12/17 13:13:57 visa Exp $ */ /* $NetBSD: maltavar.h,v 1.3 2002/03/18 10:10:16 simonb Exp $ */ /*- @@ -181,6 +181,7 @@ struct octeon_fau_map { #define BOARD_TYPE_CN3010_EVB_HS5 11 #define BOARD_TYPE_UBIQUITI_E100 20002 #define BOARD_TYPE_UBIQUITI_E200 20003 +#define BOARD_TYPE_RHINOLABS_SHASTA 20012 #define BOARD_TYPE_DSR_500 20015 #if defined(_KERNEL) || defined(_STANDALONE) |