Author: jhibbits
Date: Tue Nov 14 03:21:39 2017
New Revision: 325789
URL: https://svnweb.freebsd.org/changeset/base/325789
Log:
Use the correct board name for the Ubiquiti Unifi Security Gateway
Modified:
head/sys/contrib/octeon-sdk/cvmx-app-init.h
head/sys/contrib/octeon-sdk/cvmx-helper-board.c
Modified: head/sys/contrib/octeon-sdk/cvmx-app-init.h
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-app-init.h Tue Nov 14 02:30:21 2017
(r325788)
+++ head/sys/contrib/octeon-sdk/cvmx-app-init.h Tue Nov 14 03:21:39 2017
(r325789)
@@ -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_USG= 20004,
+ CVMX_BOARD_TYPE_CUST_UBIQUITI_E110= 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(en
#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_USG)
+ ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_UBIQUITI_E110)
#endif
#if defined(OCTEON_VENDOR_RADISYS)
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE)
Modified: head/sys/contrib/octeon-sdk/cvmx-helper-board.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-helper-board.c Tue Nov 14 02:30:21
2017 (r325788)
+++ head/sys/contrib/octeon-sdk/cvmx-helper-board.c Tue Nov 14 03:21:39
2017 (r325789)
@@ -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_USG:
+ case CVMX_BOARD_TYPE_CUST_UBIQUITI_E110:
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_USG)
+ cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_CUST_UBIQUITI_E110)
{
/* 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_boar
#endif
#if defined(OCTEON_VENDOR_UBIQUITI)
case CVMX_BOARD_TYPE_CUST_UBIQUITI_E100:
- case CVMX_BOARD_TYPE_CUST_UBIQUITI_USG:
+ case CVMX_BOARD_TYPE_CUST_UBIQUITI_E110:
#endif
#if defined(OCTEON_BOARD_CAPK_0100ND)
case CVMX_BOARD_TYPE_CN3010_EVB_HS5:
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
