Received: from mail.onstor.com (66.201.51.107) by exch1.onstor.net
 (10.0.0.225) with Microsoft SMTP Server id 8.1.311.2; Tue, 5 May 2009
 17:42:15 -0700
Received: from psmtp.com ([64.18.0.123]) by mail.onstor.com with Microsoft
 SMTPSVC(6.0.3790.3959);	 Tue, 5 May 2009 17:42:12 -0700
Received: from source ([213.58.128.207]) by exprod5mx237.postini.com
 ([64.18.4.13]) with SMTP;	Tue, 05 May 2009 17:42:12 PDT
Received: from localhost.localdomain ([127.0.0.1]:49351 "EHLO
	ftp.linux-mips.org" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org	with
 ESMTP id S20021329AbZEFAiu (ORCPT	<rfc822;andy.sharp@onstor.com>); Wed, 6 May
 2009 01:38:50 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 06 May 2009 01:38:33
 +0100 (BST)
Received: from mail3.caviumnetworks.com ([12.108.191.235]:16977 "EHLO
	mail3.caviumnetworks.com" rhost-flags-OK-OK-OK-OK)	by ftp.linux-mips.org with
 ESMTP id S20021551AbZEFAgf (ORCPT	<rfc822;linux-mips@linux-mips.org>); Wed, 6
 May 2009 01:36:35 +0100
Received: from exch4.caveonetworks.com (Not Verified[192.168.16.23]) by
 mail3.caviumnetworks.com with MailMarshal (v6,2,2,3503)	id <B4a00db800002>;
 Tue, 05 May 2009 20:36:16 -0400
Received: from exch4.caveonetworks.com ([192.168.16.23]) by
 exch4.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959);	 Tue, 5 May
 2009 17:35:29 -0700
Received: from dd1.caveonetworks.com ([64.169.86.201]) by
 exch4.caveonetworks.com over TLS secured channel with Microsoft
 SMTPSVC(6.0.3790.3959);	 Tue, 5 May 2009 17:35:28 -0700
Received: from dd1.caveonetworks.com (localhost.localdomain [127.0.0.1])	by
 dd1.caveonetworks.com (8.14.2/8.14.2) with ESMTP id n460ZPdH022763;	Tue, 5
 May 2009 17:35:25 -0700
Received: (from ddaney@localhost)	by dd1.caveonetworks.com
 (8.14.2/8.14.2/Submit) id n460ZPLD022762;	Tue, 5 May 2009 17:35:25 -0700
From: David Daney <ddaney@caviumnetworks.com>
To: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>,
	"ralf@linux-mips.org" <ralf@linux-mips.org>, "gregkh@suse.de"
	<gregkh@suse.de>
CC: David Daney <ddaney@caviumnetworks.com>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Tue, 5 May 2009 17:35:18 -0700
Subject: [PATCH 3/7] MIPS: Cavium-Octeon: Add more board type constants.
Thread-Topic: [PATCH 3/7] MIPS: Cavium-Octeon: Add more board type constants.
Thread-Index: AcnN44CF5H6J55koTli5ucMrOJ8kSA==
Message-ID: <1241570122-22728-3-git-send-email-ddaney@caviumnetworks.com>
References: <4A00DA84.5040101@caviumnetworks.com>
In-Reply-To: <4A00DA84.5040101@caviumnetworks.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Internal
X-MS-Exchange-Organization-AuthMechanism: 0b
X-MS-Exchange-Organization-AuthSource: exch1.onstor.net
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-originalarrivaltime: 06 May 2009 00:35:28.0893 (UTC)
 FILETIME=[8E354AD0:01C9CDE2]
x-ems-stamp: vXWTqkupW4TOjT/qbyw9JQ==
x-ems-proccessed: 2K3Xl1OQTInXD6xxuA8z3Q==
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-neptune: 0/0/0.00/0
x-pstn-levels: (S:64.27472/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-list: linux-mips
x-archive-position: 22634
x-ecartis-version: Ecartis v1.0.0
x-original-sender: ddaney@caviumnetworks.com
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

The bootloader now uses additional board type constants.  The
octeon-ethernet driver needs some of the new values.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
---
 arch/mips/include/asm/octeon/cvmx-bootinfo.h |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/inclu=
de/asm/octeon/cvmx-bootinfo.h
index 692989a..f3c23a4 100644
--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
@@ -157,6 +157,13 @@ enum cvmx_board_types_enum {
 	CVMX_BOARD_TYPE_NIC_XLE_4G =3D 21,
 	CVMX_BOARD_TYPE_EBT5600 =3D 22,
 	CVMX_BOARD_TYPE_EBH5201 =3D 23,
+	CVMX_BOARD_TYPE_EBT5200 =3D 24,
+	CVMX_BOARD_TYPE_CB5600  =3D 25,
+	CVMX_BOARD_TYPE_CB5601  =3D 26,
+	CVMX_BOARD_TYPE_CB5200  =3D 27,
+	/* Special 'generic' board type, supports many boards */
+	CVMX_BOARD_TYPE_GENERIC =3D 28,
+	CVMX_BOARD_TYPE_EBH5610 =3D 29,
 	CVMX_BOARD_TYPE_MAX,
=20
 	/*
@@ -228,6 +235,12 @@ static inline const char *cvmx_board_type_to_string(en=
um
 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_NIC_XLE_4G)
 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBT5600)
 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBH5201)
+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBT5200)
+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CB5600)
+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CB5601)
+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CB5200)
+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_GENERIC)
+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBH5610)
 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_MAX)
=20
 			/* Customer boards listed here */
--=20
1.6.0.6


