From owner-svn-src-head@FreeBSD.ORG  Fri Jun 22 05:54:34 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B0A3A1065670;
	Fri, 22 Jun 2012 05:54:34 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9C7698FC08;
	Fri, 22 Jun 2012 05:54:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5M5sYex059526;
	Fri, 22 Jun 2012 05:54:34 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5M5sYwY059523;
	Fri, 22 Jun 2012 05:54:34 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201206220554.q5M5sYwY059523@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 22 Jun 2012 05:54:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237429 - head/sys/arm/at91
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jun 2012 05:54:34 -0000

Author: imp
Date: Fri Jun 22 05:54:34 2012
New Revision: 237429
URL: http://svn.freebsd.org/changeset/base/237429

Log:
  Move these #defines to at91reg.h (where I should have put them in the
  first place).

Modified:
  head/sys/arm/at91/at91_machdep.c
  head/sys/arm/at91/at91reg.h

Modified: head/sys/arm/at91/at91_machdep.c
==============================================================================
--- head/sys/arm/at91/at91_machdep.c	Fri Jun 22 05:48:53 2012	(r237428)
+++ head/sys/arm/at91/at91_machdep.c	Fri Jun 22 05:54:34 2012	(r237429)
@@ -281,9 +281,6 @@ static const char *soc_subtype_name[] = 
 	[AT91_ST_SAM9X35] = "at91sam9x35",
 };
 
-#define AT91_DBGU0	0x0ffff200	/* Most */
-#define AT91_DBGU1	0x0fffee00	/* SAM9263, CAP9, and SAM9G45 */
-
 struct at91_soc_info soc_data;
 
 /*

Modified: head/sys/arm/at91/at91reg.h
==============================================================================
--- head/sys/arm/at91/at91reg.h	Fri Jun 22 05:48:53 2012	(r237428)
+++ head/sys/arm/at91/at91reg.h	Fri Jun 22 05:54:34 2012	(r237429)
@@ -46,6 +46,9 @@
 #define	AT91_SYS_BASE	0xffff000
 #define	AT91_SYS_SIZE	0x1000
 
+#define AT91_DBGU0	0x0ffff200	/* Most */
+#define AT91_DBGU1	0x0fffee00	/* SAM9263, CAP9, and SAM9G45 */
+
 #define	AT91_DBGU_SIZE	0x200
 #define	DBGU_C1R		(64) /* Chip ID1 Register */
 #define	DBGU_C2R		(68) /* Chip ID2 Register */