diff options
| author | Justin Hibbits <jhibbits@FreeBSD.org> | 2018-07-10 17:01:19 +0000 |
|---|---|---|
| committer | Justin Hibbits <jhibbits@FreeBSD.org> | 2018-07-10 17:01:19 +0000 |
| commit | 07eb643e208b4ab5294196f378a9125b43d21fcf (patch) | |
| tree | 325fda17e614ba97fabef63ad391d22b3ebcceee /sys/contrib/octeon-sdk | |
| parent | 942ae5c8b8934fb60246540400a0f0765b991e25 (diff) | |
| download | src-07eb643e208b4ab5294196f378a9125b43d21fcf.tar.gz src-07eb643e208b4ab5294196f378a9125b43d21fcf.zip | |
Correct the identifier for the Unifi Security Gateway
The USG is really E120, not E110.
Notes
Notes:
svn path=/head/; revision=336173
Diffstat (limited to 'sys/contrib/octeon-sdk')
| -rw-r--r-- | sys/contrib/octeon-sdk/cvmx-app-init.h | 4 | ||||
| -rw-r--r-- | sys/contrib/octeon-sdk/cvmx-helper-board.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/contrib/octeon-sdk/cvmx-app-init.h b/sys/contrib/octeon-sdk/cvmx-app-init.h index b005627898db..ba62e0a1c403 100644 --- a/sys/contrib/octeon-sdk/cvmx-app-init.h +++ b/sys/contrib/octeon-sdk/cvmx-app-init.h @@ -311,7 +311,7 @@ enum cvmx_board_types_enum { #endif #if defined(OCTEON_VENDOR_UBIQUITI) CVMX_BOARD_TYPE_CUST_UBIQUITI_E100=20002, - CVMX_BOARD_TYPE_CUST_UBIQUITI_E110= 20004, + CVMX_BOARD_TYPE_CUST_UBIQUITI_E120= 20004, #endif #if defined(OCTEON_VENDOR_RADISYS) CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE=20002, @@ -458,7 +458,7 @@ static inline const char *cvmx_board_type_to_string(enum cvmx_board_types_enum t #endif #if defined(OCTEON_VENDOR_UBIQUITI) ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_UBIQUITI_E100) - ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_UBIQUITI_E110) + ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_UBIQUITI_E120) #endif #if defined(OCTEON_VENDOR_RADISYS) ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE) diff --git a/sys/contrib/octeon-sdk/cvmx-helper-board.c b/sys/contrib/octeon-sdk/cvmx-helper-board.c index 2c501ffae9f3..1c2096b65966 100644 --- a/sys/contrib/octeon-sdk/cvmx-helper-board.c +++ b/sys/contrib/octeon-sdk/cvmx-helper-board.c @@ -598,7 +598,7 @@ int cvmx_helper_board_get_mii_address(int ipd_port) #endif #if defined(OCTEON_VENDOR_UBIQUITI) case CVMX_BOARD_TYPE_CUST_UBIQUITI_E100: - case CVMX_BOARD_TYPE_CUST_UBIQUITI_E110: + case CVMX_BOARD_TYPE_CUST_UBIQUITI_E120: if (ipd_port > 2) return -1; return (7 - ipd_port); @@ -1501,7 +1501,7 @@ int __cvmx_helper_board_hardware_enable(int interface) } #if defined(OCTEON_VENDOR_UBIQUITI) else if (cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_CUST_UBIQUITI_E100 || - cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_CUST_UBIQUITI_E110) + cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_CUST_UBIQUITI_E120) { /* Configure ASX cloks for all ports on interface 0. */ if (interface == 0) @@ -1592,7 +1592,7 @@ cvmx_helper_board_usb_clock_types_t __cvmx_helper_board_usb_get_clock_type(void) #endif #if defined(OCTEON_VENDOR_UBIQUITI) case CVMX_BOARD_TYPE_CUST_UBIQUITI_E100: - case CVMX_BOARD_TYPE_CUST_UBIQUITI_E110: + case CVMX_BOARD_TYPE_CUST_UBIQUITI_E120: #endif #if defined(OCTEON_BOARD_CAPK_0100ND) case CVMX_BOARD_TYPE_CN3010_EVB_HS5: |