svn commit: r244984 - in head/sys: conf contrib/octeon-sdk mips/conf

[Juli Mallett]

Author: jmallett
Date: Wed Jan  2 23:17:50 2013
New Revision: 244984
URL: http://svnweb.freebsd.org/changeset/base/244984

Log:
  Add basic support for the Ubiquiti EdgeRouter Lite.
  
  Note that USB does not currently work, and the flash is connected via USB, so
  local storage is not working.

Modified:
  head/sys/conf/options.mips
  head/sys/contrib/octeon-sdk/cvmx-app-init.h
  head/sys/contrib/octeon-sdk/cvmx-helper-board.c
  head/sys/mips/conf/OCTEON1

Modified: head/sys/conf/options.mips
==============================================================================
--- head/sys/conf/options.mips	Wed Jan  2 22:26:46 2013	(r244983)
+++ head/sys/conf/options.mips	Wed Jan  2 23:17:50 2013	(r244984)
@@ -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
 

Modified: head/sys/contrib/octeon-sdk/cvmx-app-init.h
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-app-init.h	Wed Jan  2 22:26:46 2013	(r244983)
+++ head/sys/contrib/octeon-sdk/cvmx-app-init.h	Wed Jan  2 23:17:50 2013	(r244984)
@@ -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_typ
 	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

Modified: head/sys/contrib/octeon-sdk/cvmx-helper-board.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-helper-board.c	Wed Jan  2 22:26:46 2013	(r244983)
+++ head/sys/contrib/octeon-sdk/cvmx-helper-board.c	Wed Jan  2 23:17:50 2013	(r244984)
@@ -592,6 +592,12 @@ int cvmx_helper_board_get_mii_address(in
 		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.  */

Modified: head/sys/mips/conf/OCTEON1
==============================================================================
--- head/sys/mips/conf/OCTEON1	Wed Jan  2 22:26:46 2013	(r244983)
+++ head/sys/mips/conf/OCTEON1	Wed Jan  2 23:17:50 2013	(r244984)
@@ -39,6 +39,7 @@ makeoptions	DEBUG=-g		#Build kernel with
 # 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