svn commit: r320073 - stable/11/sys/contrib/octeon-sdk

[Justin Hibbits]

Author: jhibbits
Date: Sun Jun 18 17:20:48 2017
New Revision: 320073
URL: https://svnweb.freebsd.org/changeset/base/320073

Log:
  MFC r317928
  
  Add necessary bits to get FreeBSD booting on the Unifi Security Gateway
  
  Summary:
  The Ubiquiti Unifi Security Gateway is virtually identical to the
  EdgeRouter Lite, with a smaller PCB and apparently a different board identifier.
  Simply adding the new board identifier alongside the ERL identifier, FreeBSD
  boots successfully, and can access the needed peripherals.
  
  Approved by:	re(bdrewery)

Modified:
  stable/11/sys/contrib/octeon-sdk/cvmx-app-init.h
  stable/11/sys/contrib/octeon-sdk/cvmx-helper-board.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/contrib/octeon-sdk/cvmx-app-init.h
==============================================================================
--- stable/11/sys/contrib/octeon-sdk/cvmx-app-init.h	Sun Jun 18 16:43:57 2017	(r320072)
+++ stable/11/sys/contrib/octeon-sdk/cvmx-app-init.h	Sun Jun 18 17:20:48 2017	(r320073)
@@ -311,6 +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,
 #endif
 #if defined(OCTEON_VENDOR_RADISYS)
     CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE=20002,
@@ -457,6 +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)
 #endif
 #if defined(OCTEON_VENDOR_RADISYS)
 	ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE)

Modified: stable/11/sys/contrib/octeon-sdk/cvmx-helper-board.c
==============================================================================
--- stable/11/sys/contrib/octeon-sdk/cvmx-helper-board.c	Sun Jun 18 16:43:57 2017	(r320072)
+++ stable/11/sys/contrib/octeon-sdk/cvmx-helper-board.c	Sun Jun 18 17:20:48 2017	(r320073)
@@ -598,6 +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:
 	    if (ipd_port > 2)
 		return -1;
 	    return (7 - ipd_port);
@@ -1499,7 +1500,8 @@ 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)
+    else if (cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_CUST_UBIQUITI_E100 ||
+        cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_CUST_UBIQUITI_USG)
     {
 	/* Configure ASX cloks for all ports on interface 0.  */
 	if (interface == 0)
@@ -1590,6 +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:
 #endif
 #if defined(OCTEON_BOARD_CAPK_0100ND)
 	case CVMX_BOARD_TYPE_CN3010_EVB_HS5: