diff options
| author | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2014-10-26 15:13:05 +0000 |
|---|---|---|
| committer | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2014-10-26 15:13:05 +0000 |
| commit | b60c3155fbb8b9eab9a7db1d72694f933809d7a0 (patch) | |
| tree | da889e57be35aa9e79cc1f6b35771c9395a5d262 | |
| parent | 7d1093e0657d5bded49b6ac79ef55c3df432dd9a (diff) | |
- add board type of edgerouter pro
- don't attach octrtc on the edgerouter pro either
openbsd boots fine on this system, but as there's no ethernet support yet
there's no storage at all right now.
ok pirofti@
| -rw-r--r-- | sys/arch/octeon/dev/octrtc.c | 5 | ||||
| -rw-r--r-- | sys/arch/octeon/include/octeonvar.h | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/sys/arch/octeon/dev/octrtc.c b/sys/arch/octeon/dev/octrtc.c index 29922aa1e06..8b8b5e4d8fe 100644 --- a/sys/arch/octeon/dev/octrtc.c +++ b/sys/arch/octeon/dev/octrtc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: octrtc.c,v 1.3 2014/08/11 19:00:50 miod Exp $ */ +/* $OpenBSD: octrtc.c,v 1.4 2014/10/26 15:13:04 jasper Exp $ */ /* * Copyright (c) 2013, 2014 Paul Irofti. @@ -84,7 +84,8 @@ octrtc_match(struct device *parent, void *match, void *aux) if (strcmp(maa->maa_name, cf->cf_driver->cd_name) != 0) return 0; /* No RTC on Ubiquiti */ - if (octeon_boot_info->board_type == BOARD_TYPE_UBIQUITI_E100) + if ((octeon_boot_info->board_type == BOARD_TYPE_UBIQUITI_E100) || + (octeon_boot_info->board_type == BOARD_TYPE_UBIQUITI_E200)) return 0; return 1; } diff --git a/sys/arch/octeon/include/octeonvar.h b/sys/arch/octeon/include/octeonvar.h index 245de165d6a..7929e60c591 100644 --- a/sys/arch/octeon/include/octeonvar.h +++ b/sys/arch/octeon/include/octeonvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: octeonvar.h,v 1.21 2014/08/11 18:29:56 miod Exp $ */ +/* $OpenBSD: octeonvar.h,v 1.22 2014/10/26 15:13:04 jasper Exp $ */ /* $NetBSD: maltavar.h,v 1.3 2002/03/18 10:10:16 simonb Exp $ */ /*- @@ -194,14 +194,12 @@ struct octeon_fau_map { /* * Octeon board types known to work with OpenBSD/octeon. - * One of the main reasons for keeping this list is to be able to tell which - * boards do and do not have octcf(4). Currently the only board not to have octcf(4) - * is BOARD_TYPE_UBIQUITI_E100. Sadly, this number is also used by other vendors, but - * we don't run on those boards yet. When that time comes, iobus needs extra care for - * not blindly attaching octcf(4) on every board. + * NB: BOARD_TYPE_UBIQUITI_E100 is also used by other vendors, but we don't run + * on those boards yet. */ #define BOARD_TYPE_SIM 1 #define BOARD_TYPE_UBIQUITI_E100 20002 +#define BOARD_TYPE_UBIQUITI_E200 20003 #if defined(_KERNEL) || defined(_STANDALONE) #define OCTEON_ARGV_MAX 64 |