From owner-svn-src-projects@FreeBSD.ORG  Mon Nov 25 22:37:37 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 50EE362A;
 Mon, 25 Nov 2013 22:37:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 400912F1B;
 Mon, 25 Nov 2013 22:37:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPMbbgQ067217;
 Mon, 25 Nov 2013 22:37:37 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPMbbKQ067216;
 Mon, 25 Nov 2013 22:37:37 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201311252237.rAPMbbKQ067216@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Mon, 25 Nov 2013 22:37:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r258604 - projects/specific_leg/sys/arm/ti
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Nov 2013 22:37:37 -0000

Author: andrew
Date: Mon Nov 25 22:37:36 2013
New Revision: 258604
URL: http://svnweb.freebsd.org/changeset/base/258604

Log:
  Add the platform code for the Ti am335x, as used in the BeagleBoard.

Modified:
  projects/specific_leg/sys/arm/ti/ti_machdep.c

Modified: projects/specific_leg/sys/arm/ti/ti_machdep.c
==============================================================================
--- projects/specific_leg/sys/arm/ti/ti_machdep.c	Mon Nov 25 22:24:05 2013	(r258603)
+++ projects/specific_leg/sys/arm/ti/ti_machdep.c	Mon Nov 25 22:37:36 2013	(r258604)
@@ -60,6 +60,14 @@ __FBSDID("$FreeBSD$");
 /* Start of address space used for bootstrap map */
 #define DEVMAP_BOOTSTRAP_MAP_START	0xF0000000
 
+#if !defined(SOC_OMAP4) && !defined(SOC_TI_AM335X)
+#error "Unknown SoC"
+#endif
+
+#if defined(SOC_OMAP4) && defined(SOC_TI_AM335X)
+#error Not yet able to use both OMAP4 and AM335X in the same kernel
+#endif
+
 void (*ti_cpu_reset)(void);
 
 static int
@@ -118,10 +126,6 @@ ti_am335x_devmap_init(platform_t plat)
 }
 #endif
 
-#if !defined(SOC_OMAP4) && !defined(SOC_TI_AM335X)
-#error "Unknown SoC"
-#endif
-
 struct arm32_dma_range *
 bus_dma_get_range(void)
 {
@@ -159,3 +163,15 @@ static platform_method_t omap4_methods[]
 FDT_PLATFORM_DEF(omap4, "omap4", 0, "ti,omap4430");
 #endif
 
+#if defined(SOC_TI_AM335X)
+static platform_method_t am335x_methods[] = {
+	PLATFORMMETHOD(platform_attach,		ti_attach),
+	PLATFORMMETHOD(platform_devmap_init,	ti_am335x_devmap_init),
+	PLATFORMMETHOD(platform_lastaddr,	ti_lastaddr),
+
+	PLATFORMMETHOD_END,
+};
+
+FDT_PLATFORM_DEF(am335x, "am335x", 0, "ti,am335x");
+#endif
+