d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the correct board name for the Ubiquiti Unifi Security Gateway

Browse Source
This commit is contained in:
Justin Hibbits 2017-11-14 03:21:39 +00:00
parent d0f6ab7920
commit f8135d8282
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/contrib/octeon-sdk/cvmx-app-init.h
View File

@ -311,7 +311,7 @@ enum cvmx_board_types_enum {
#endif #endif
#if defined(OCTEON_VENDOR_UBIQUITI) #if defined(OCTEON_VENDOR_UBIQUITI)
CVMX_BOARD_TYPE_CUST_UBIQUITI_E100=20002, CVMX_BOARD_TYPE_CUST_UBIQUITI_E100=20002,
CVMX_BOARD_TYPE_CUST_UBIQUITI_USG= 20004, CVMX_BOARD_TYPE_CUST_UBIQUITI_E110= 20004,
#endif #endif
#if defined(OCTEON_VENDOR_RADISYS) #if defined(OCTEON_VENDOR_RADISYS)
CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE=20002, 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 #endif
#if defined(OCTEON_VENDOR_UBIQUITI) #if defined(OCTEON_VENDOR_UBIQUITI)
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_UBIQUITI_E100) 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 #endif
#if defined(OCTEON_VENDOR_RADISYS) #if defined(OCTEON_VENDOR_RADISYS)
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE) ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE)

6
sys/contrib/octeon-sdk/cvmx-helper-board.c
View File

@ -598,7 +598,7 @@ int cvmx_helper_board_get_mii_address(int ipd_port)
#endif #endif
#if defined(OCTEON_VENDOR_UBIQUITI) #if defined(OCTEON_VENDOR_UBIQUITI)
case CVMX_BOARD_TYPE_CUST_UBIQUITI_E100: 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) if (ipd_port > 2)
return -1; return -1;
return (7 - ipd_port); return (7 - ipd_port);
@ -1501,7 +1501,7 @@ int __cvmx_helper_board_hardware_enable(int interface)
} }
#if defined(OCTEON_VENDOR_UBIQUITI) #if defined(OCTEON_VENDOR_UBIQUITI)
else if (cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_CUST_UBIQUITI_E100 || 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. */ /* Configure ASX cloks for all ports on interface 0. */
if (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 #endif
#if defined(OCTEON_VENDOR_UBIQUITI) #if defined(OCTEON_VENDOR_UBIQUITI)
case CVMX_BOARD_TYPE_CUST_UBIQUITI_E100: case CVMX_BOARD_TYPE_CUST_UBIQUITI_E100:
case CVMX_BOARD_TYPE_CUST_UBIQUITI_USG: case CVMX_BOARD_TYPE_CUST_UBIQUITI_E110:
#endif #endif
#if defined(OCTEON_BOARD_CAPK_0100ND) #if defined(OCTEON_BOARD_CAPK_0100ND)
case CVMX_BOARD_TYPE_CN3010_EVB_HS5: case CVMX_BOARD_TYPE_CN3010_EVB_HS5: