diff options
| author | Juli Mallett <jmallett@FreeBSD.org> | 2013-01-02 23:17:50 +0000 |
|---|---|---|
| committer | Juli Mallett <jmallett@FreeBSD.org> | 2013-01-02 23:17:50 +0000 |
| commit | b29648facda6ea9f38971d143d17dd6885aafbe3 (patch) | |
| tree | 1998b3b35b335df4176be748870020fb2c00a240 | |
| parent | e1d6f7b47bcfd373531c1f366a91d581d5582bd8 (diff) | |
Notes
| -rw-r--r-- | sys/conf/options.mips | 1 | ||||
| -rw-r--r-- | sys/contrib/octeon-sdk/cvmx-app-init.h | 6 | ||||
| -rw-r--r-- | sys/contrib/octeon-sdk/cvmx-helper-board.c | 6 | ||||
| -rw-r--r-- | sys/mips/conf/OCTEON1 | 1 |
4 files changed, 14 insertions, 0 deletions
diff --git a/sys/conf/options.mips b/sys/conf/options.mips index a86a749133aa..2f27206bde85 100644 --- a/sys/conf/options.mips +++ b/sys/conf/options.mips @@ -73,6 +73,7 @@ MAXMEM opt_global.h # OCTEON_MODEL opt_cvmx.h OCTEON_VENDOR_LANNER opt_cvmx.h +OCTEON_VENDOR_UBIQUITI opt_cvmx.h OCTEON_VENDOR_RADISYS opt_cvmx.h OCTEON_BOARD_CAPK_0100ND opt_cvmx.h diff --git a/sys/contrib/octeon-sdk/cvmx-app-init.h b/sys/contrib/octeon-sdk/cvmx-app-init.h index a986814a6b45..605f43e77f38 100644 --- a/sys/contrib/octeon-sdk/cvmx-app-init.h +++ b/sys/contrib/octeon-sdk/cvmx-app-init.h @@ -299,6 +299,9 @@ enum cvmx_board_types_enum { CVMX_BOARD_TYPE_CUST_LANNER_MR320= 20002, CVMX_BOARD_TYPE_CUST_LANNER_MR321X=20007, #endif +#if defined(OCTEON_VENDOR_UBIQUITI) + CVMX_BOARD_TYPE_CUST_UBIQUITI_E100=20002, +#endif #if defined(OCTEON_VENDOR_RADISYS) CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE=20002, #endif @@ -426,6 +429,9 @@ static inline const char *cvmx_board_type_to_string(enum cvmx_board_types_enum t ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_LANNER_MR320) ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_LANNER_MR321X) #endif +#if defined(OCTEON_VENDOR_UBIQUITI) + ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_UBIQUITI_E100) +#endif #if defined(OCTEON_VENDOR_RADISYS) ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE) #endif diff --git a/sys/contrib/octeon-sdk/cvmx-helper-board.c b/sys/contrib/octeon-sdk/cvmx-helper-board.c index deb60186556a..0d40bcbf1243 100644 --- a/sys/contrib/octeon-sdk/cvmx-helper-board.c +++ b/sys/contrib/octeon-sdk/cvmx-helper-board.c @@ -592,6 +592,12 @@ int cvmx_helper_board_get_mii_address(int ipd_port) return -1; } #endif +#if defined(OCTEON_VENDOR_UBIQUITI) + case CVMX_BOARD_TYPE_CUST_UBIQUITI_E100: + if (ipd_port > 2) + return -1; + return (7 - ipd_port); +#endif #if defined(OCTEON_VENDOR_RADISYS) case CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE: /* No MII. */ diff --git a/sys/mips/conf/OCTEON1 b/sys/mips/conf/OCTEON1 index 1d637d85ad70..3ddb164f647d 100644 --- a/sys/mips/conf/OCTEON1 +++ b/sys/mips/conf/OCTEON1 @@ -39,6 +39,7 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols # Board-specific support that cannot be auto-detected at runtime. #options OCTEON_VENDOR_LANNER # Support for Lanner boards. #options OCTEON_VENDOR_RADISYS # Support for Radisys boards. +#options OCTEON_VENDOR_UBIQUITI # Support for Ubiquiti boards. #options OCTEON_BOARD_CAPK_0100ND # Support for CAPK-0100nd. # Compile for a specified Octeon model. If not specified, support for |